Bugzilla – Attachment 29944 Details for
Bug 10542
QueryParser + OpacSuppression doesn't allow search in 'all libraries'
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10542 [Follow-up] - QueryParser + OpacSuppression doesn't allow search in 'all libraries'
Bug-10542---QueryParser--OpacSuppression-doesnt-al.patch (text/plain), 2.58 KB, created by
David Cook
on 2014-07-21 23:38:44 UTC
(
hide
)
Description:
Bug 10542 [Follow-up] - QueryParser + OpacSuppression doesn't allow search in 'all libraries'
Filename:
MIME Type:
Creator:
David Cook
Created:
2014-07-21 23:38:44 UTC
Size:
2.58 KB
patch
obsolete
>From 631eacaa5c8e08b3bd8a60e187c0503370bbda5c Mon Sep 17 00:00:00 2001 >From: David Cook <dcook@prosentient.com.au> >Date: Tue, 22 Jul 2014 09:26:03 +1000 >Subject: [PATCH] Bug 10542 - QueryParser + OpacSuppression doesn't allow > search in 'all libraries' > >Since we're using the $query_type variable to detect if this pre-built >query is PQF, we need to use PQF syntax (rather than QueryParser >syntax) when adding to the query. I've made a lot of notes of somewhat >incoherent notes on Bugzilla talking about PQF, CCL, and QP syntaxes, >but I'm hoping to refine these notes on a wiki page for future >reference. > >_TEST PLAN_ > >1) Set 'Suppress in Opac' (ie 942$n) to 1 for one record >2) Re-index Zebra >3) Set 'OpacSuppression' to 'Hide' >4) Set 'UseQueryParser' to 'Do not try' >5) In the staff client, do a search that will return that suppressed >record as well as a few records that are NOT suppressed >6) Note that you can return that suppressed record in the staff client >7) Do the same search in the OPAC >8) Note that the suppressed record doesn't appear >9) Set 'UseQueryParser' to 'Try' && re-run the OPAC search >10) Note that no results appear (the logs will probably mention a >ZOOM error) > >11) Apply patch > >12) Re-run the OPAC search >13) Note that the suppressed record doesn't appear, and that the >not suppressed records are showing (it's important that you are >getting some results...as ZOOM errors are silent in the UI). >14) Set 'UseQueryParser' to 'Do not try' >15) Re-run the search >16) Note that the suppressed record doesn't appear, and that the >not suppressed records are showing >--- > opac/opac-search.pl | 5 +++-- > 1 files changed, 3 insertions(+), 2 deletions(-) > >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 7edaf6d..cac6ab5 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -482,7 +482,7 @@ if (C4::Context->preference('OpacSuppression')) { > my $IPRange = C4::Context->preference('OpacSuppressionByIPRange'); > if ($IPAddress !~ /^$IPRange/) { > if ( $query_type eq 'pqf' ) { >- $query = "($query) && -(suppress:1)"; >+ $query = '@not '.$query.' @attr 1=9011 1'; > } else { > $query = "($query) not Suppress=1"; > } >@@ -490,7 +490,8 @@ if (C4::Context->preference('OpacSuppression')) { > } > else { > if ( $query_type eq 'pqf' ) { >- $query = "($query) && -(suppress:1)"; >+ #$query = "($query) && -(suppress:1)"; #QP syntax >+ $query = '@not '.$query.' @attr 1=9011 1'; #PQF syntax > } else { > $query = "($query) not Suppress=1"; > } >-- >1.7.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10542
:
26208
|
26251
|
26283
|
26311
|
29909
|
29910
|
29942
|
29944
|
30478
|
30479
|
30660
|
30661