From a16860fef11e719db5aeef8e1cc839fb47b9d40e Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Tue, 1 Sep 2020 21:22:31 +0200 Subject: [PATCH] Bug 26313: (follow-up) Fix OPAC and "Show volumes" links Elasticsearch requires the booleans in search requests to be uppercase. This fixes the "Show analytics" link in OPAC (same as first patch for intranet) and the "Show volume" link. To test both patches: Set UseControlNumber = Use 1) "Show analytics" - Turn SearchEngine to Elasticsearch and make sure it works - Pick any serial record in your database, make sure 001 is set - Go to new > new child record - Fill in 245 and save - For both staff and OPAC: - Click on the "In" link, it should bring you to the parent record - Click on "Show analytics", it should show your analytical record - Switch to "Zebra" - verify links still work. 2) "Show volumes" - Turn SearchEngine to Elasticsearch again - Pick any serial record in your database, make sure 001 is set - Set LDR, pos. 19 = a - Set - Note 001 value - Find another record and edit it - Set LDR, pos. 19 = a or b, LDR 7 not a or b (m will work) - Set 773$ title of set record $w 001 of set record - For both staff and OPAC: - Click on the "In: link, it should bring up your set record - Click on the "Show volumes" link, it should bring up the volume - Switch to "Zebra" - verify all links still work. Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi Signed-off-by: Jonathan Druart (cherry picked from commit 8a37842e1af3fdc9e5e4eb2eb6ec9190ed31915e) Signed-off-by: Lucas Gass (cherry picked from commit 7a8b7ba2f42c9709301b321f3c8e05bc0af78487) Signed-off-by: Aleisha Amohia --- .../intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl | 2 +- .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 29c124537b..0d40c3a8b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -343,7 +343,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=rcn:+not+(bib-level:a+or+bib-level:b) + /cgi-bin/koha/catalogue/search.pl?q=rcn:+NOT+(bib-level:a+OR+bib-level:b) /cgi-bin/koha/catalogue/search.pl?q=ti,phr: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index a805ac2717..393846038d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -345,7 +345,7 @@ - /cgi-bin/koha/opac-search.pl?q=rcn:+and+(bib-level:a+or+bib-level:b) + /cgi-bin/koha/opac-search.pl?q=rcn:+AND+(bib-level:a+OR+bib-level:b) /cgi-bin/koha/opac-search.pl?q=Host-item: @@ -362,7 +362,7 @@ - /cgi-bin/koha/opac-search.pl?q=rcn:+not+(bib-level:a+or+bib-level:b) + /cgi-bin/koha/opac-search.pl?q=rcn:+NOT+(bib-level:a+OR+bib-level:b) /cgi-bin/koha/opac-search.pl?q=ti,phr: -- 2.39.5