From 1ed52bb13536c933227a0d81e2871bd152fceaa6 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 11 Sep 2020 18:44:13 +0000 Subject: [PATCH] Bug 5927: [Alternate] Show series information in staff and opac results pages This moves the series info to a template in the XSLT utils files and adds a few variables to make it work right. To test: 1 - Create a catalog records with: 440 series fields 490 traced series fields 490 untraced series fields 2 - View the details pages for these records and note the display and the links formed 3 - Apply patch 4 - Confirm the details pages look the same 5 - Search on staff and opac to return the records 6 - Confirm the results pages form the same series as on details 7 - Confirm the links work the same Signed-off-by: Katrin Fischer --- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 160 +------------------- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 7 + .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 161 +++++++++++++++++++++ .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 158 +------------------- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 8 + .../bootstrap/en/xslt/MARC21slimUtils.xsl | 161 +++++++++++++++++++++ 6 files changed, 347 insertions(+), 308 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl index 16f727a0e1..6d0d9e649a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -190,135 +190,12 @@ se - - - - Series: - - - /cgi-bin/koha/catalogue/search.pl?q=se,phr:"" - - - - av - - - - - - - - - ; - - - ; - - - - - - /cgi-bin/koha/catalogue/search.pl?q=se,phr:"" - - - - av - - - - - - ; - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=rcn: - - - - a_t - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=an: - - - - a_t - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=se,phr:""&q=au:"" - - - - a_t - - - - - - - - : - - ; - - - - - - - - - a_t - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=an: - - - - a_t - - - - - - - /cgi-bin/koha/catalogue/search.pl?q=se,phr:"" - - - - a_t - - - - - - - - : - - ; - - - - - + + /cgi-bin/koha/catalogue/search.pl + + + @@ -1396,33 +1273,6 @@ - - - - n - n - fghkdlmor - - - - - p - p - fghkdlmor - - - - - - - - - - - - - - diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl index be70b9abcb..d263de1ea1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -16,6 +16,7 @@ + @@ -839,6 +840,12 @@ + + /cgi-bin/koha/catalogue/search.pl + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl index 7fb14ad515..0c019a2ca3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl @@ -397,6 +397,167 @@ + + + + n + n + fghkdlmor + + + + + p + p + fghkdlmor + + + + + + + + + + + + + + + + + + + + + Series: + + + ?q=se,phr:"" + + + + av + + + + + + + + + ; + + + ; + + + + + + ?q=se,phr:"" + + + + av + + + + + + ; + + + + + + + ?q=rcn: + + + + a_t + + + + + + + ?q=an: + + + + a_t + + + + + + + ?q=se,phr:""&q=au:"" + + + + a_t + + + + + + + + : + + ; + + + + + + + + + + a_t + + + + + + + ?q=an: + + + + a_t + + + + + + + ?q=se,phr:"" + + + + a_t + + + + + + + + : + + ; + + + + + + + - - Series: - - - /cgi-bin/koha/opac-search.pl?q=se,phr:"" - - - - av - - - - - - - - - ; - - - ; - - - - - - /cgi-bin/koha/opac-search.pl?q=se,phr:"" - - - - av - - - - - - ; - - - - - - - /cgi-bin/koha/opac-search.pl?q=rcn: - - - - a_t - - - - - - - /cgi-bin/koha/opac-search.pl?q=an: - - - - a_t - - - - - - - /cgi-bin/koha/opac-search.pl?q=se,phr:""&q=au:"" - - - - a_t - - - - - - - - : - - ; - - - - - - - - - a_t - - - - - - - /cgi-bin/koha/opac-search.pl?q=an: - - - - a_t - - - - - - - /cgi-bin/koha/opac-search.pl?q=se,phr:"" - - - - a_t - - - - - - - - : - - ; - - - - + + /cgi-bin/koha/opac-search.pl + + + @@ -1884,33 +1763,6 @@ - - - - n - n - fghkdlmor - - - - - p - p - fghkdlmor - - - - - - - - - - - - - - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl index a0879f65d4..78aa361918 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -22,6 +22,8 @@ + + @@ -638,6 +640,12 @@

+ + /cgi-bin/koha/opac-search.pl + + + + Edition: diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl index bc8b4f75f9..564dbd17f9 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl +++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl @@ -361,6 +361,167 @@
+ + + + + + + Series: + + + ?q=se,phr:"" + + + + av + + + + + + + + + ; + + + ; + + + + + + ?q=se,phr:"" + + + + av + + + + + + ; + + + + + + + ?q=rcn: + + + + a_t + + + + + + + ?q=an: + + + + a_t + + + + + + + ?q=se,phr:""&q=au:"" + + + + a_t + + + + + + + + : + + ; + + + + + + + + + + a_t + + + + + + + ?q=an: + + + + a_t + + + + + + + ?q=se,phr:"" + + + + a_t + + + + + + + + : + + ; + + + + + + + + + + + n + n + fghkdlmor + + + + + p + p + fghkdlmor + + + + + + + + + + + + + +