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

(-)a/catalogue/search.pl (+19 lines)
Lines 395-400 if ( $params->{'multibranchlimit'} ) { Link Here
395
    }
395
    }
396
}
396
}
397
397
398
for ( my $i=0; $i<@limits; $i++ ) {
399
    if ( $limits[$i] =~ /^branch:/ ) {
400
        my $branchfield  = C4::Context->preference('SearchLimitLibrary');
401
        if ( $branchfield eq "homebranch" ) {
402
            $limits[$i] =~ s/branch/homebranch/;
403
        }
404
        elsif ( $branchfield eq "holdingbranch" ) {
405
            $limits[$i] =~ s/branch/holdingbranch/;
406
        }
407
        else {
408
            my $homebranchlimit = $limits[$i];
409
            my $holdingbranchlimit = $limits[$i];
410
            $homebranchlimit =~ s/branch/homebranch/;
411
            $holdingbranchlimit =~ s/branch/holdingbranch/;
412
            $limits[$i] = "$homebranchlimit or $holdingbranchlimit";
413
        }
414
    }
415
}
416
398
my $available;
417
my $available;
399
foreach my $limit(@limits) {
418
foreach my $limit(@limits) {
400
    if ($limit =~/available/) {
419
    if ($limit =~/available/) {
(-)a/opac/opac-search.pl (-1 / +19 lines)
Lines 516-521 if ( $params->{'multibranchlimit'} || ( $branch_group_limit && $branch_group_lim Link Here
516
    }
516
    }
517
}
517
}
518
518
519
for ( my $i=0; $i<@limits; $i++ ) {
520
    if ( $limits[$i] =~ /^branch:/ ) {
521
        my $branchfield  = C4::Context->preference('SearchLimitLibrary');
522
        if ( $branchfield eq "homebranch" ) {
523
            $limits[$i] =~ s/branch/homebranch/;
524
        }
525
        elsif ( $branchfield eq "holdingbranch" ) {
526
            $limits[$i] =~ s/branch/holdingbranch/;
527
        }
528
        else {
529
            my $homebranchlimit = $limits[$i];
530
            my $holdingbranchlimit = $limits[$i];
531
            $homebranchlimit =~ s/branch/homebranch/;
532
            $holdingbranchlimit =~ s/branch/holdingbranch/;
533
            $limits[$i] = "$homebranchlimit or $holdingbranchlimit";
534
        }
535
    }
536
}
537
519
my $available;
538
my $available;
520
foreach my $limit(@limits) {
539
foreach my $limit(@limits) {
521
    if ($limit =~/available/) {
540
    if ($limit =~/available/) {
522
- 

Return to bug 21249