From 06f0209840d290bb1a7340f4b1af8d55e932f7c1 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Mon, 14 May 2018 16:18:29 +0200 Subject: [PATCH] Bug 20765: Fix search for items by acqdate in label batch In Tools > Label creator, when creating a batch you can add items using a search. This search has filters on acquisition date. Actually those filters does not work. The create a search using CCL syntaxe to query Zebra search engine. The cause is that operator "ge" or "le" must be before "st-date-normalized" in CCL query. Looks like it is because of "st-date-normalized" uses "r=o" in ccl.properties. Test plan : 1) Check in advance search you have indexed acquisition date 2) Go to Tools > Label creator 3) Click on New > Label batch 4) Click on Add item(s) 5) Enter a relevent date in "Added on or after date" and in "Added on or before date" 6) Click on "Search" => SUCCESS: You get results 7) Apply the patch 8) Retry the 'Add item(s)' step => SUCCESS: Patch doesn't change behaviour for old Zebra 9) Get rid of the patch on your working branch 10) Use the latest Zebra: - /etc/apt/sources.list.d/indexdata.list: deb http://ftp.indexdata.dk/debian jessie main - Add the repo key: $ wget http://ftp.indexdata.dk/debian/indexdata.asc -O- | sudo apt-key add - - Upgrade: $ sudo apt update; sudo apt dist-upgrade $ sudo koha-rebuild-zebra -f -a -b -v kohadev $ restart_all 11) Retry the 'Add item(s)' step => FAIL: No results! 9) Apply the patch, retry => SUCCESS: Search results! - Sign off :-D Signed-off-by: Maryse Simard Followed the test plan and it works. Signed-off-by: Tomas Cohen Arazi It doesn't break with 2.0.59-1 (stretch/jessie), and fixes the problem for 2.1.X. Signed-off-by: Nick Clemens (cherry picked from commit a6f8eac4edb6463d8ff16928d6f2cddcf4dfbfc2) Signed-off-by: Martin Renvoize --- labels/label-item-search.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl index 57f3ff3ea8..5b202245de 100755 --- a/labels/label-item-search.pl +++ b/labels/label-item-search.pl @@ -88,7 +88,7 @@ if ( $op eq "do_search" ) { "acqdate(" . $datefrom . '-)'; } else { $ccl_query .= ' and ' if $ccl_textbox; - $ccl_query .= "acqdate,st-date-normalized,ge=" . $datefrom; + $ccl_query .= "acqdate,ge,st-date-normalized=" . $datefrom; } } } @@ -102,7 +102,7 @@ if ( $op eq "do_search" ) { $ccl_query .= "acqdate(-" . $dateto . ')'; } else { $ccl_query .= ' and ' if ( $ccl_textbox || $datefrom ); - $ccl_query .= "acqdate,st-date-normalized,le=" . $dateto; + $ccl_query .= "acqdate,le,st-date-normalized=" . $dateto; } } } -- 2.39.5