Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 10542: Fix QueryParser with OpacSupression

Browse source 
OpacSupressions manipulates the query string after the buildQuery
call and so breaks with queryParser enabled.  This patch adds
checks for queryParser and manipulates the query before passing it
to buildQuery if it is enabled, but leaves the post buildQuery
manipultation when queryParser is disabled

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Adding a sing after test

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Martin Renvoize 2014-03-12 17:43:20 +00:00 committed by Tomas Cohen Arazi
parent 27eccf4122
commit 449b365a48
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
opac/opac-search.pl
View file

@ -481,11 +481,19 @@ if (C4::Context->preference('OpacSuppression')) {
my $IPAddress = $ENV{'REMOTE_ADDR'};
my $IPRange = C4::Context->preference('OpacSuppressionByIPRange');
if ($IPAddress !~ /^$IPRange/) {
$query = "($query) not Suppress=1";
if ( $query_type eq 'pqf' ) {
$query = "($query) && -(suppress:1)";
} else {
$query = "($query) not Suppress=1";
}
}
}
else {
$query = "($query) not Suppress=1";
if ( $query_type eq 'pqf' ) {
$query = "($query) && -(suppress:1)";
} else {
$query = "($query) not Suppress=1";
}
}
}