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

(-)a/opac/opac-search.pl (-3 / +26 lines)
Lines 445-450 my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_ Link Here
445
445
446
my @results;
446
my @results;
447
447
448
# Add OPAC suppression - requires at least one item indexed with Suppress
449
if (C4::Context->preference('OpacSuppression')) {
450
    # OPAC suppression by IP address
451
    if (C4::Context->preference('OpacSuppressionByIPRange')) {
452
        my $IPAddress = $ENV{'REMOTE_ADDR'};
453
        my $IPRange = C4::Context->preference('OpacSuppressionByIPRange');
454
        if ($IPAddress !~ /^$IPRange/)  {
455
	    if ( C4::Context->preference('UseQueryParser') ) {
456
                $query = "$query -suppress:1";
457
	    }
458
        }
459
    }
460
    else {
461
	if ( C4::Context->preference('UseQueryParser') ) {
462
            $query = "$query -suppress:1";
463
        }
464
    }
465
}
466
467
448
## I. BUILD THE QUERY
468
## I. BUILD THE QUERY
449
( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
469
( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by, 0, $lang);
450
470
Lines 478-488 if (C4::Context->preference('OpacSuppression')) { Link Here
478
        my $IPAddress = $ENV{'REMOTE_ADDR'};
498
        my $IPAddress = $ENV{'REMOTE_ADDR'};
479
        my $IPRange = C4::Context->preference('OpacSuppressionByIPRange');
499
        my $IPRange = C4::Context->preference('OpacSuppressionByIPRange');
480
        if ($IPAddress !~ /^$IPRange/)  {
500
        if ($IPAddress !~ /^$IPRange/)  {
481
            $query = "($query) not Suppress=1";
501
	    unless ( C4::Context->preference('UseQueryParser') ) {
502
                $query = "($query) not Suppress=1";
503
	    }
482
        }
504
        }
483
    }
505
    }
484
    else {
506
    else {
485
        $query = "($query) not Suppress=1";
507
	unless ( C4::Context->preference('UseQueryParser') ) {
508
            $query = "($query) not Suppress=1";
509
        }
486
    }
510
    }
487
}
511
}
488
512
489
- 

Return to bug 10542