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

(-)a/catalogue/search.pl (-1 / +2 lines)
Lines 412-418 my @operands = $cgi->param('q'); Link Here
412
my @limits = $cgi->param('limit');
412
my @limits = $cgi->param('limit');
413
413
414
if($params->{'multibranchlimit'}) {
414
if($params->{'multibranchlimit'}) {
415
    push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
415
    my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
416
    push @limits, $multibranch if ($multibranch ne  '()');
416
}
417
}
417
418
418
my $available;
419
my $available;
(-)a/opac/opac-search.pl (-4 / +7 lines)
Lines 65-74 my $cgi = new CGI; Link Here
65
65
66
my $branch_group_limit = $cgi->param("branch_group_limit");
66
my $branch_group_limit = $cgi->param("branch_group_limit");
67
if ( $branch_group_limit ) {
67
if ( $branch_group_limit ) {
68
    if ( $branch_group_limit =~ /^multibranchlimit/ ) {
68
    if ( $branch_group_limit =~ /^multibranchlimit-/ ) {
69
        # For search groups we are going to convert this branch_group_limit CGI
70
        # parameter into a multibranchlimit CGI parameter for the purposes of
71
        # actually performing the query
69
        $cgi->param(
72
        $cgi->param(
70
            -name => 'multibranchlimit',
73
            -name => 'multibranchlimit',
71
            -values => [ ( split( 'multibranchlimit-', $branch_group_limit ) )[1] ]
74
            -values => substr($branch_group_limit, 17)
72
        );
75
        );
73
    } else {
76
    } else {
74
        $cgi->append(
77
        $cgi->append(
Lines 403-409 my @limits = $cgi->param('limit'); Link Here
403
@limits = map { uri_unescape($_) } @limits;
406
@limits = map { uri_unescape($_) } @limits;
404
407
405
if($params->{'multibranchlimit'}) {
408
if($params->{'multibranchlimit'}) {
406
    push @limits, '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
409
    my $multibranch = '('.join( " or ", map { "branch: $_ " } @{ GetBranchesInCategory( $params->{'multibranchlimit'} ) } ).')';
410
    push @limits, $multibranch if ($multibranch ne  '()');
407
}
411
}
408
412
409
my $available;
413
my $available;
410
- 

Return to bug 10281