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

(-)a/C4/Biblio.pm (-2 / +2 lines)
Lines 1633-1639 sub GetMarcSubjects { Link Here
1633
                push @link_loop, {
1633
                push @link_loop, {
1634
                    limit    => $subject_limit,
1634
                    limit    => $subject_limit,
1635
                    'link'   => $linkvalue,
1635
                    'link'   => $linkvalue,
1636
                    operator => (scalar @link_loop) ? ' and ' : undef
1636
                    operator => (scalar @link_loop) ? ' AND ' : undef
1637
                };
1637
                };
1638
            }
1638
            }
1639
            my @this_link_loop = @link_loop;
1639
            my @this_link_loop = @link_loop;
Lines 1771-1777 sub GetMarcSeries { Link Here
1771
1771
1772
            push @link_loop, {
1772
            push @link_loop, {
1773
                'link' => $linkvalue,
1773
                'link' => $linkvalue,
1774
                operator => (scalar @link_loop) ? ' and ' : undef
1774
                operator => (scalar @link_loop) ? ' AND ' : undef
1775
            };
1775
            };
1776
1776
1777
            if ($volume_number) {
1777
            if ($volume_number) {
(-)a/C4/Heading.pm (-2 / +2 lines)
Lines 202-215 sub _search { Link Here
202
202
203
    if ($index) {
203
    if ($index) {
204
        push @marclist, $index;
204
        push @marclist, $index;
205
        push @and_or,   'and';
205
        push @and_or,   'AND';
206
        push @operator, $self->{'match_type'};
206
        push @operator, $self->{'match_type'};
207
        push @value,    $self->{'search_form'};
207
        push @value,    $self->{'search_form'};
208
    }
208
    }
209
209
210
    #    if ($self->{'thesaurus'}) {
210
    #    if ($self->{'thesaurus'}) {
211
    #        push @marclist, 'thesaurus';
211
    #        push @marclist, 'thesaurus';
212
    #        push @and_or, 'and';
212
    #        push @and_or, 'AND';
213
    #        push @excluding, '';
213
    #        push @excluding, '';
214
    #        push @operator, 'is';
214
    #        push @operator, 'is';
215
    #        push @value, $self->{'thesaurus'};
215
    #        push @value, $self->{'thesaurus'};
(-)a/C4/Search.pm (-1 / +1 lines)
Lines 1585-1591 sub _build_initial_query { Link Here
1585
    my $operator = "";
1585
    my $operator = "";
1586
    if ($params->{previous_operand}){
1586
    if ($params->{previous_operand}){
1587
        #If there is a previous operand, add a supplied operator or the default 'and'
1587
        #If there is a previous operand, add a supplied operator or the default 'and'
1588
        $operator = ($params->{operator}) ? " ".($params->{operator})." " : ' and ';
1588
        $operator = ($params->{operator}) ? " ".($params->{operator})." " : ' AND ';
1589
    }
1589
    }
1590
1590
1591
    #NOTE: indexes_set is typically set when doing truncation or field weighting
1591
    #NOTE: indexes_set is typically set when doing truncation or field weighting
(-)a/Koha/Biblio.pm (-1 / +1 lines)
Lines 1038-1044 sub get_marc_authors { Link Here
1038
                push @link_loop, {
1038
                push @link_loop, {
1039
                    limit    => 'au',
1039
                    limit    => 'au',
1040
                    'link'   => $linkvalue,
1040
                    'link'   => $linkvalue,
1041
                    operator => (scalar @link_loop) ? ' and ' : undef
1041
                    operator => (scalar @link_loop) ? ' AND ' : undef
1042
                };
1042
                };
1043
            }
1043
            }
1044
            my @this_link_loop = @link_loop;
1044
            my @this_link_loop = @link_loop;
(-)a/cataloguing/value_builder/marc21_linking_section.pl (-1 / +1 lines)
Lines 168-174 my $launcher = sub { Link Here
168
        my $startfrom      = $query->param('startfrom');
168
        my $startfrom      = $query->param('startfrom');
169
        my $resultsperpage = $query->param('resultsperpage') || 20;
169
        my $resultsperpage = $query->param('resultsperpage') || 20;
170
        my $orderby;
170
        my $orderby;
171
        my $op = 'and';
171
        my $op = 'AND';
172
172
173
        my $searcher = Koha::SearchEngine::Search->new(
173
        my $searcher = Koha::SearchEngine::Search->new(
174
            { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
174
            { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
(-)a/cataloguing/value_builder/unimarc_field_4XX.pl (-1 / +1 lines)
Lines 337-343 sub plugin { Link Here
337
        my $startfrom      = $query->param('startfrom');
337
        my $startfrom      = $query->param('startfrom');
338
        my $resultsperpage = $query->param('resultsperpage') || 20;
338
        my $resultsperpage = $query->param('resultsperpage') || 20;
339
        my $orderby;
339
        my $orderby;
340
        my $op = 'and';
340
        my $op = 'AND';
341
        $search = 'kw:'.$search." $op mc-itemtype:".$itype if $itype;
341
        $search = 'kw:'.$search." $op mc-itemtype:".$itype if $itype;
342
        my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
342
        my $searcher = Koha::SearchEngine::Search->new({index => $Koha::SearchEngine::BIBLIOS_INDEX});
343
        my ( $errors, $results, $total_hits ) = $searcher->simple_search_compat($search, $startfrom * $resultsperpage, $resultsperpage );
343
        my ( $errors, $results, $total_hits ) = $searcher->simple_search_compat($search, $startfrom * $resultsperpage, $resultsperpage );
(-)a/misc/migration_tools/bulkmarcimport.pl (-2 / +2 lines)
Lines 592-598 sub build_query { Link Here
592
	  my $string = build_simplequery($matchingpoint,$record);
592
	  my $string = build_simplequery($matchingpoint,$record);
593
	  push @searchstrings,$string if (length($string)>0);
593
	  push @searchstrings,$string if (length($string)>0);
594
        }
594
        }
595
    my $op = 'and';
595
    my $op = 'AND';
596
    return join(" $op ",@searchstrings);
596
    return join(" $op ",@searchstrings);
597
}
597
}
598
sub build_simplequery {
598
sub build_simplequery {
Lines 608-614 sub build_simplequery { Link Here
608
		  }
608
		  }
609
        }
609
        }
610
    }
610
    }
611
    my $op = 'and';
611
    my $op = 'AND';
612
    return join(" $op ",@searchstrings);
612
    return join(" $op ",@searchstrings);
613
}
613
}
614
sub report_item_errors {
614
sub report_item_errors {
(-)a/serials/subscription-bib-search.pl (-2 / +1 lines)
Lines 89-95 if ( $op eq "do_search" && $query ) { Link Here
89
    # add the limits if applicable
89
    # add the limits if applicable
90
    my $itemtypelimit = $input->param('itemtypelimit');
90
    my $itemtypelimit = $input->param('itemtypelimit');
91
    my $ccodelimit    = $input->param('ccodelimit');
91
    my $ccodelimit    = $input->param('ccodelimit');
92
    my $op = 'and';
92
    my $op = 'AND';
93
    $query .= " $op $itype_or_itemtype:$itemtypelimit" if $itemtypelimit;
93
    $query .= " $op $itype_or_itemtype:$itemtypelimit" if $itemtypelimit;
94
    $query .= " $op ccode:$ccodelimit" if $ccodelimit;
94
    $query .= " $op ccode:$ccodelimit" if $ccodelimit;
95
    $resultsperpage = $input->param('resultsperpage');
95
    $resultsperpage = $input->param('resultsperpage');
96
- 

Return to bug 25616