View | Details | Raw Unified | Return to bug 36798
Collapse All | Expand All

(-)a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm (-1 / +5 lines)
Lines 753-758 sub _convert_index_fields { Link Here
753
            field => exists $index_field_convert{$f} ? $index_field_convert{$f} : $f,
753
            field => exists $index_field_convert{$f} ? $index_field_convert{$f} : $f,
754
            type  => $index_type_convert{ $t // '__default' }
754
            type  => $index_type_convert{ $t // '__default' }
755
        };
755
        };
756
        $r->{field} .= '-all'
757
            if C4::Context->preference('SearchCancelledAndInvalidISBNandISSN') && $r->{field} =~ /^is[bs]n$/;
756
        $r->{field} = ($mc . $r->{field}) if $mc && $r->{field};
758
        $r->{field} = ($mc . $r->{field}) if $mc && $r->{field};
757
        $r->{field} || $r->{type} ? $r : undef;
759
        $r->{field} || $r->{type} ? $r : undef;
758
    } @indexes;
760
    } @indexes;
Lines 820-825 sub _convert_index_strings_freeform { Link Here
820
    $search =~ s/($field_name_pattern)(?:,[\w-]*)?($multi_field_pattern):/\L$1\E$2:/og;
822
    $search =~ s/($field_name_pattern)(?:,[\w-]*)?($multi_field_pattern):/\L$1\E$2:/og;
821
    # Resolve possible field aliases
823
    # Resolve possible field aliases
822
    $search =~ s/($field_name_pattern)($multi_field_pattern):/(exists $index_field_convert{$1} ? $index_field_convert{$1} : $1).($1 eq 'kw' ? "$2" : "$2:")/oge;
824
    $search =~ s/($field_name_pattern)($multi_field_pattern):/(exists $index_field_convert{$1} ? $index_field_convert{$1} : $1).($1 eq 'kw' ? "$2" : "$2:")/oge;
825
    if ( C4::Context->preference('SearchCancelledAndInvalidISBNandISSN') ) {
826
        $search =~ s/\b(is[bs]n)(?=$multi_field_pattern:)/$1-all/g;
827
    }
823
    return $search;
828
    return $search;
824
}
829
}
825
830
826
- 

Return to bug 36798