From 4bf61cb595fe1848913df9c5bcf8c481288b886c Mon Sep 17 00:00:00 2001 From: Ere Maijala Date: Fri, 26 Oct 2018 18:13:10 +0300 Subject: [PATCH] Bug 14716: Fix more unencoded url parameters. Fixes issues found during QA and unifies the SubfieldSelect function across the utils xsl's. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit bffd0d8f11fd68e7706e57c571c9b29d15d800ea) Signed-off-by: Martin Renvoize --- .../prog/en/xslt/MARC21slim2ATOM.xsl | 2 +- .../en/xslt/MARC21slim2intranetDetail.xsl | 14 ++++---- .../en/xslt/MARC21slim2intranetResults.xsl | 4 +-- .../prog/en/xslt/MARC21slimUtils.xsl | 11 +++--- .../en/xslt/NORMARCslim2intranetDetail.xsl | 13 +++---- .../en/xslt/NORMARCslim2intranetResults.xsl | 10 +++--- .../prog/en/xslt/NORMARCslimUtils.xsl | 19 ++++++++--- .../en/xslt/UNIMARCslim2intranetResults.xsl | 2 +- .../prog/en/xslt/UNIMARCslimUtils.xsl | 14 ++++++-- .../en/xslt/MARC21slim2OPACDetail.xsl | 34 +++++++++++-------- .../en/xslt/MARC21slim2OPACResults.xsl | 2 +- .../bootstrap/en/xslt/MARC21slimUtils.xsl | 19 ++++++++--- .../en/xslt/NORMARCslim2OPACDetail.xsl | 18 +++++----- .../en/xslt/NORMARCslim2OPACResults.xsl | 4 +-- .../bootstrap/en/xslt/NORMARCslimUtils.xsl | 19 ++++++++--- .../en/xslt/UNIMARCslim2OPACResults.xsl | 2 +- .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 16 ++++++--- 17 files changed, 126 insertions(+), 77 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl index aabefe46fa..1233d67f8c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2ATOM.xsl @@ -23,7 +23,7 @@ urn:tcn: - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index acddfdb7c3..6af2301b79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -261,7 +261,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=rcn:+and+(bib-level:a+or+bib-level:b) + /cgi-bin/koha/catalogue/search.pl?q=rcn:+and+(bib-level:a+or+bib-level:b) /cgi-bin/koha/catalogue/search.pl?q=Host-item: @@ -278,7 +278,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: @@ -689,7 +689,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q= @@ -722,7 +722,7 @@ - /cgi-bin/koha/authorities/detail.pl?authid= + /cgi-bin/koha/authorities/detail.pl?authid= /intranet-tmpl/prog/img/filefind.png @@ -748,7 +748,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q= @@ -1003,7 +1003,7 @@ - /cgi-bin/koha/catalogue/detail.pl?biblionumber= + /cgi-bin/koha/catalogue/detail.pl?biblionumber= @@ -1204,7 +1204,7 @@ OPAC view: - /cgi-bin/koha/opac-detail.pl?biblionumber=_blankOpen in new window. + /cgi-bin/koha/opac-detail.pl?biblionumber=_blankOpen in new window. diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index c4e77f272f..75d397d707 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -306,7 +306,7 @@ - + title @@ -354,7 +354,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au:"" diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 95895d38f0..7435ea1dc2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -44,7 +44,7 @@ - + @@ -125,16 +125,17 @@ Assumes LOC convention: (OrgCode)recordNumber. If OrgCode is not present, return full string. Additionally, handle various brackets/parentheses. Chop leading and trailing spaces. + Returns the value URI-encoded. --> - + - + @@ -197,13 +198,13 @@ - /cgi-bin/koha/catalogue/detail.pl?biblionumber= + /cgi-bin/koha/catalogue/detail.pl?biblionumber= - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl index 874f46ab98..861488963e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl @@ -106,7 +106,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au: @@ -121,7 +121,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au: @@ -135,7 +135,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au: @@ -248,7 +248,7 @@ - /cgi-bin/koha/catalogue/detail.pl?biblionumber= + /cgi-bin/koha/catalogue/detail.pl?biblionumber= @@ -408,7 +408,7 @@ @@ -417,6 +417,7 @@ AND (su: ) + 1 @@ -602,7 +603,7 @@

OPAC View: - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= _blank Open in new window

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl index 9fff0a01ed..0c8711765b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl @@ -260,7 +260,7 @@ - + title @@ -306,7 +306,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au:"" @@ -321,7 +321,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au:"" @@ -343,7 +343,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au:"" @@ -448,7 +448,7 @@ - /cgi-bin/koha/catalogue/detail.pl?biblionumber= + /cgi-bin/koha/catalogue/detail.pl?biblionumber= diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl index 458253de57..e068fab616 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslimUtils.xsl @@ -32,6 +32,7 @@ + @@ -42,7 +43,14 @@ - + + + + + + + + @@ -99,16 +107,17 @@ Assumes LOC convention: (OrgCode)recordNumber. If OrgCode is not present, return full string. Additionally, handle various brackets/parentheses. Chop leading and trailing spaces. + Returns the value URI-encoded. --> - + - + @@ -218,13 +227,13 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl index 3e30890cd5..a6ba1c22c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetResults.xsl @@ -34,7 +34,7 @@ - + title diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl index e78e8d7c55..48d50c5b50 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl @@ -115,6 +115,7 @@ + @@ -125,7 +126,14 @@ - + + + + + + + + @@ -250,7 +258,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=su: @@ -287,7 +295,7 @@ - /cgi-bin/koha/catalogue/search.pl?q=an: + /cgi-bin/koha/catalogue/search.pl?q=an: /cgi-bin/koha/catalogue/search.pl?q=au: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl index 33966dfdc5..5ba71e6b30 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -725,7 +725,7 @@ - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: @@ -756,7 +756,7 @@ - /cgi-bin/koha/opac-authoritiesdetail.pl?authid= + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= /opac-tmpl//images/filefind.png vertical-align:middle @@ -781,7 +781,7 @@ - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: /cgi-bin/koha/opac-search.pl?q= @@ -839,7 +839,7 @@ /cgi-bin/koha/opac-search.pl?q=control-number: - + @@ -1055,9 +1055,13 @@ - - a_t - + + + + a_t + + + @@ -1066,12 +1070,12 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= - /cgi-bin/koha/opac-search.pl?q=ti,phr: + /cgi-bin/koha/opac-search.pl?q=ti,phr: @@ -1162,7 +1166,7 @@ /cgi-bin/koha/opac-search.pl?q=Control-number: - /cgi-bin/koha/opac-search.pl?q=ti,phr: + /cgi-bin/koha/opac-search.pl?q=ti,phr:
@@ -1221,7 +1225,7 @@ - /cgi-bin/koha/opac-search.pl?q=ti,phr: + /cgi-bin/koha/opac-search.pl?q=ti,phr: @@ -1284,7 +1288,7 @@ - /cgi-bin/koha/opac-search.pl?q=ti,phr: + /cgi-bin/koha/opac-search.pl?q=ti,phr: @@ -1331,10 +1335,10 @@ - /cgi-bin/koha/opac-search.pl?q=an:"" + /cgi-bin/koha/opac-search.pl?q=an:"" - /cgi-bin/koha/opac-search.pl?q=au:"" + /cgi-bin/koha/opac-search.pl?q=au:"" @@ -1564,7 +1568,7 @@ - /cgi-bin/koha/opac-authoritiesdetail.pl?authid= + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= /opac-tmpl//images/filefind.png vertical-align:middle diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index fd98cb1371..e4c55fac83 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -413,7 +413,7 @@ - + title diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl index e4ab72ad30..97df929be5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl @@ -31,6 +31,7 @@ + @@ -41,7 +42,14 @@ - + + + + + + + + @@ -114,16 +122,17 @@ Assumes LOC convention: (OrgCode)recordNumber. If OrgCode is not present, return full string. Additionally, handle various brackets/parentheses. Chop leading and trailing spaces. + Returns the value URI-encoded. --> - + - + @@ -186,13 +195,13 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl index 917de68fb3..36486ba7d7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl @@ -101,7 +101,7 @@ - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: /cgi-bin/koha/opac-search.pl?q=au: @@ -110,7 +110,7 @@ - /cgi-bin/koha/opac-authoritiesdetail.pl?authid= + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= /opac-tmpl//images/filefind.png vertical-align:middle @@ -127,7 +127,7 @@ - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: /cgi-bin/koha/opac-search.pl?q=au: @@ -136,7 +136,7 @@ - /cgi-bin/koha/opac-authoritiesdetail.pl?authid= + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= /opac-tmpl//images/filefind.png vertical-align:middle @@ -152,7 +152,7 @@ - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: /cgi-bin/koha/opac-search.pl?q=au: @@ -161,7 +161,7 @@ - /cgi-bin/koha/opac-authoritiesdetail.pl?authid= + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= /opac-tmpl//images/filefind.png vertical-align:middle @@ -277,7 +277,7 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= @@ -437,7 +437,7 @@ @@ -465,7 +465,7 @@ - /cgi-bin/koha/opac-authoritiesdetail.pl?authid= + /cgi-bin/koha/opac-authoritiesdetail.pl?authid= /opac-tmpl//images/filefind.png vertical-align:middle diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl index b1391463d0..534f51b1c2 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl @@ -299,7 +299,7 @@ - + title @@ -436,7 +436,7 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl index 403087a8d8..f06ee8130e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl @@ -31,6 +31,7 @@ + @@ -41,7 +42,14 @@ - + + + + + + + + @@ -95,16 +103,17 @@ Assumes LOC convention: (OrgCode)recordNumber. If OrgCode is not present, return full string. Additionally, handle various brackets/parentheses. Chop leading and trailing spaces. + Returns the value URI-encoded. --> - + - + @@ -215,13 +224,13 @@ - /cgi-bin/koha/opac-detail.pl?biblionumber= + /cgi-bin/koha/opac-detail.pl?biblionumber= - /cgi-bin/koha/opac-search.pl?q=an: + /cgi-bin/koha/opac-search.pl?q=an: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl index 3c971773f0..874cf99f2b 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl @@ -48,7 +48,7 @@ - + title diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl index 00c07413a5..4195ddf7a7 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl @@ -33,6 +33,7 @@ + @@ -43,7 +44,14 @@ - + + + + + + + + @@ -265,7 +273,7 @@ /cgi-bin/koha/opac-search.pl?q=an: - + @@ -350,7 +358,7 @@ /cgi-bin/koha/opac-search.pl?q=an: - + @@ -381,7 +389,7 @@ /cgi-bin/koha/opac-idref.pl?unimarc3= - + IdRef gb_page_center[600,500] -- 2.39.5