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

(-)a/C4/Search.pm (-1 / +2 lines)
Lines 21-26 use C4::Biblio qw( TransformMarcToKoha GetMarcFromKohaField GetFrameworkCode Get Link Here
21
use C4::Koha qw( getFacets GetVariationsOfISBN GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN getitemtypeimagelocation );
21
use C4::Koha qw( getFacets GetVariationsOfISBN GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN getitemtypeimagelocation );
22
use Koha::DateUtils;
22
use Koha::DateUtils;
23
use Koha::Libraries;
23
use Koha::Libraries;
24
use Koha::SearchEngine::QueryBuilder;
24
use Lingua::Stem;
25
use Lingua::Stem;
25
use XML::Simple;
26
use XML::Simple;
26
use C4::XSLT qw( XSLTParse4Display );
27
use C4::XSLT qw( XSLTParse4Display );
Lines 33-38 use Koha::Logger; Link Here
33
use Koha::Patrons;
34
use Koha::Patrons;
34
use Koha::Recalls;
35
use Koha::Recalls;
35
use Koha::RecordProcessor;
36
use Koha::RecordProcessor;
37
use Koha::SearchFilters;
36
use URI::Escape;
38
use URI::Escape;
37
use Business::ISBN;
39
use Business::ISBN;
38
use MARC::Record;
40
use MARC::Record;
Lines 1525-1531 sub buildQuery { Link Here
1525
    }
1527
    }
1526
    Koha::Logger->get->debug("QUERY BEFORE LIMITS: >$query<");
1528
    Koha::Logger->get->debug("QUERY BEFORE LIMITS: >$query<");
1527
1529
1528
1529
    # Normalize the query and limit strings
1530
    # Normalize the query and limit strings
1530
    # This is flawed , means we can't search anything with : in it
1531
    # This is flawed , means we can't search anything with : in it
1531
    # if user wants to do ccl or cql, start the query with that
1532
    # if user wants to do ccl or cql, start the query with that
(-)a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm (-2 / +11 lines)
Lines 804-810 sub _convert_index_strings_freeform { Link Here
804
    # Lower case field names
804
    # Lower case field names
805
    $search =~ s/($field_name_pattern)(?:,[\w-]*)?($multi_field_pattern):/\L$1\E$2:/og;
805
    $search =~ s/($field_name_pattern)(?:,[\w-]*)?($multi_field_pattern):/\L$1\E$2:/og;
806
    # Resolve possible field aliases
806
    # Resolve possible field aliases
807
    $search =~ s/($field_name_pattern)($multi_field_pattern):/(exists $index_field_convert{$1} ? $index_field_convert{$1} : $1)."$2:"/oge;
807
    $search =~ s/($field_name_pattern)($multi_field_pattern):/(exists $index_field_convert{$1} ? $index_field_convert{$1} : $1).($1 eq 'kw' ? "$2" : "$2:")/oge;
808
    return $search;
808
    return $search;
809
}
809
}
810
810
Lines 1067-1072 sub _fix_limit_special_cases { Link Here
1067
            next unless defined($start) && defined($end);
1067
            next unless defined($start) && defined($end);
1068
            push @new_lim, "date-of-publication:[$start TO $end]";
1068
            push @new_lim, "date-of-publication:[$start TO $end]";
1069
        }
1069
        }
1070
        elsif( $l =~ /^search_filter:/ ){
1071
            my ($filter_id) = ( $l =~ /^search_filter:(.*)$/ );
1072
            my $search_filter = Koha::SearchFilters->find( $filter_id );
1073
            next unless $search_filter;
1074
            my $expanded = $search_filter->expand_filter;
1075
            foreach my $e ( @{$self->_fix_limit_special_cases($expanded)} ) {
1076
                push @new_lim, $self->clean_search_term( $e );
1077
            }
1078
#            push @new_lim, @{$self->_fix_limit_special_cases($expanded)};
1079
        }
1070
        elsif ( $l =~ /^yr,st-numeric=/ ) {
1080
        elsif ( $l =~ /^yr,st-numeric=/ ) {
1071
            my ($date) = ( $l =~ /^yr,st-numeric=(.*)$/ );
1081
            my ($date) = ( $l =~ /^yr,st-numeric=(.*)$/ );
1072
            next unless defined($date);
1082
            next unless defined($date);
1073
- 

Return to bug 17170