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

(-)a/catalogue/search.pl (-2 / +13 lines)
Lines 413-423 my @nolimits = map uri_unescape($_), $cgi->multi_param('nolimit'); Link Here
413
my %is_nolimit = map { $_ => 1 } @nolimits;
413
my %is_nolimit = map { $_ => 1 } @nolimits;
414
@limits = grep { not $is_nolimit{$_} } @limits;
414
@limits = grep { not $is_nolimit{$_} } @limits;
415
415
416
my $branchfield = C4::Context->preference('AdvancedSearchBranchFieldToUse');
417
416
if($params->{'multibranchlimit'}) {
418
if($params->{'multibranchlimit'}) {
417
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
419
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
418
    my @libraries = $search_group->all_libraries;
420
    my @libraries = $search_group->all_libraries;
419
    my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
421
     my $multihomebranch = '('.join( " or ", map { 'homebranch:     ' . $_->id } @libraries ) .')';
420
    push @limits, $multibranch if ($multibranch ne  '()');
422
     my $multiholdingbranch = '('.join( " or ", map { 'holdingbranch: ' . $_->id } @libraries ) .')';
423
424
    if ( $branchfield eq "homebranch") {
425
        push @limits, $multihomebranch if ( $multihomebranch ne '()');
426
    } elsif ( $branchfield eq "holdingbranch") {
427
        push @limits, $multiholdingbranch if ( $multiholdingbranch ne '()');
428
    } else {
429
        my $multihomeandholdingbranch = '('.join( " or ", map { 'homebranch: ' . $_->id, 'holdingbranch: ' . $_->id}  @libraries ) .')';
430
        push @limits, $multihomeandholdingbranch if ($multihomeandholdingbranch ne  '()');
431
    }
421
}
432
}
422
433
423
my $available;
434
my $available;
(-)a/installer/data/mysql/atomicupdate/bug_21249-Branch_to_limit_advanced_search_results.sql (+1 lines)
Line 0 Link Here
1
INSERT INTO systempreferences (variable, value, options, explanation, type) VALUES ('AdvancedSearchBranchFieldToUse', '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');
(-)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 500-510 if (@searchCategories > 0) { Link Here
500
500
501
@limits = map { uri_unescape($_) } @limits;
501
@limits = map { uri_unescape($_) } @limits;
502
502
503
my $branchfield = C4::Context->preference('AdvancedSearchBranchFieldToUse');
504
503
if($params->{'multibranchlimit'}) {
505
if($params->{'multibranchlimit'}) {
504
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
506
    my $search_group = Koha::Library::Groups->find( $params->{multibranchlimit} );
505
    my @libraries = $search_group->all_libraries;
507
    my @libraries = $search_group->all_libraries;
506
    my $multibranch = '('.join( " or ", map { 'branch: ' . $_->branchcode } @libraries ) .')';
508
    my $multihomebranch = '('.join( " or ", map { 'homebranch: ' . $_->id } @libraries ) .')';
507
    push @limits, $multibranch if ($multibranch ne  '()');
509
    my $multiholdingbranch = '('.join( " or ", map { 'holdingbranch: ' . $_->id } @libraries ) .')';
510
511
    if ( $branchfield eq "homebranch" ) {
512
        push @limits, $multihomebranch if ( $multihomebranch ne '()');
513
    } elsif ( $branchfield eq "holdingbranch") {
514
        push @limits, $multiholdingbranch if ( $multiholdingbranch ne '()');
515
    } else {
516
        my $multihomeandholdingbranch = '('.join( " or ", map { 'homebranch: ' . $_->id, 'holdingbranch: ' . $_->id}  @libraries ) .')';
517
        push @limits, $multihomeandholdingbranch if ($multihomeandholdingbranch ne  '()');
518
    }
508
}
519
}
509
520
510
my $available;
521
my $available;
511
- 

Return to bug 21249