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

(-)a/catalogue/search.pl (-2 / +13 lines)
Lines 396-406 my @nolimits = map uri_unescape($_), $cgi->multi_param('nolimit'); Link Here
396
my %is_nolimit = map { $_ => 1 } @nolimits;
396
my %is_nolimit = map { $_ => 1 } @nolimits;
397
@limits = grep { not $is_nolimit{$_} } @limits;
397
@limits = grep { not $is_nolimit{$_} } @limits;
398
398
399
my $branchfield = C4::Context->preference('AdvancedSearchBranchFieldToUse');
400
399
if($params->{'multibranchlimit'}) {
401
if($params->{'multibranchlimit'}) {
400
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
402
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
401
    my @libraries = $search_group->all_libraries;
403
    my @libraries = $search_group->all_libraries;
402
    my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
404
     my $multihomebranch = '('.join( " or ", map { 'homebranch:     ' . $_->id } @libraries ) .')';
403
    push @limits, $multibranch if ($multibranch ne  '()');
405
     my $multiholdingbranch = '('.join( " or ", map { 'holdingbranch: ' . $_->id } @libraries ) .')';
406
407
    if ( $branchfield eq "homebranch") {
408
        push @limits, $multihomebranch if ( $multihomebranch ne '()');
409
    } elsif ( $branchfield eq "holdingbranch") {
410
        push @limits, $multiholdingbranch if ( $multiholdingbranch ne '()');
411
    } else {
412
        my $multihomeandholdingbranch = '('.join( " or ", map { 'homebranch: ' . $_->id, 'holdingbranch: ' . $_->id}  @libraries ) .')';
413
        push @limits, $multihomeandholdingbranch if ($multihomeandholdingbranch ne  '()');
414
    }
404
}
415
}
405
416
406
my $available;
417
my $available;
(-)a/installer/data/mysql/atomicupdate/bug_21249-Branch_to_limit_advanced_search_results.sql (+2 lines)
Line 0 Link Here
1
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('AdvancedSearchBranchToLimit', 'homebranch and holdingbranch', 'homebranch|holdingbranch|homebranch and holdingbranch', 'When a library or group of libraries is selected from the advanced search compare the selected branch value against this branch field(s) selected', 'choice');
2
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (+8 lines)
Lines 151-156 Searching: Link Here
151
                  az: from A to Z.
151
                  az: from A to Z.
152
                  za: from Z to A.
152
                  za: from Z to A.
153
        -
153
        -
154
            - pref: AdvancedSearchBranchFieldToUse
155
              default: homebranch and holdingbranch
156
              choices:
157
                  homebranch: homebranch
158
                  holdingbranch: holdingbranch
159
                  homebranch and holdingbranch: homebranch and holdingbranch
160
            - When a library or group of libraries is selected from the advanced search compare the selected branch value against this branch field(s) selected
161
        -
154
            - pref: displayFacetCount
162
            - pref: displayFacetCount
155
              type: boolean
163
              type: boolean
156
              default: no
164
              default: no
(-)a/opac/opac-search.pl (-3 / +13 lines)
Lines 491-501 if (@searchCategories > 0) { Link Here
491
491
492
@limits = map { uri_unescape($_) } @limits;
492
@limits = map { uri_unescape($_) } @limits;
493
493
494
my $branchfield = C4::Context->preference('AdvancedSearchBranchFieldToUse');
495
494
if($params->{'multibranchlimit'}) {
496
if($params->{'multibranchlimit'}) {
495
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
497
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
496
    my @libraries = $search_group->all_libraries;
498
    my @libraries = $search_group->all_libraries;
497
    my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
499
    my $multihomebranch = '('.join( " or ", map { 'homebranch: ' . $_->id } @libraries ) .')';
498
    push @limits, $multibranch if ($multibranch ne  '()');
500
    my $multiholdingbranch = '('.join( " or ", map { 'holdingbranch: ' . $_->id } @libraries ) .')';
501
502
    if ( $branchfield eq "homebranch" ) {
503
        push @limits, $multihomebranch if ( $multihomebranch ne '()');
504
    } elsif ( $branchfield eq "holdingbranch") {
505
        push @limits, $multiholdingbranch if ( $multiholdingbranch ne '()');
506
    } else {
507
        my $multihomeandholdingbranch = '('.join( " or ", map { 'homebranch: ' . $_->id, 'holdingbranch: ' . $_->id}  @libraries ) .')';
508
        push @limits, $multihomeandholdingbranch if ($multihomeandholdingbranch ne  '()');
509
    }
499
}
510
}
500
511
501
my $available;
512
my $available;
502
- 

Return to bug 21249