From 8029a5c6c02e8f33be8f37bc230ef61714f06222 Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Mon, 4 Jul 2022 21:09:05 -0300
Subject: [PATCH] Bug 31106: Fix links generated in XSLTs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch addresses the case of links that are generated on the XSLT
side, those linking to and from host records using 773$t and 773$a.

To test:
1. Pick a bibliographic record (I chose 'Unconditional' from the sample
   data
2. Add " and ? to the title statement. I changed it to
   'Uncond"itional?¿'
3. Add a child record to it
4. Open the detail page for the host record
=> FAIL: It doesn't show the 'Show analytics' link
5. Repeat 4 for the same record, in the OPAC
=> FAIL: It doesn't show the 'Show analytics' link
6. Apply this patch
7. Repeat 4 and 5.
=> SUCCESS: Links are shown!
8. Follow the links
=> SUCCESS: The links take you to the right resultset!
9. Go to the child record, and notice the link back to the parent works
   :-D
10. Sign off :-D

Sponsored-by: Theke Solutions

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../en/xslt/MARC21slim2intranetDetail.xsl     | 24 +++++++++++++--
 .../prog/en/xslt/MARC21slimUtils.xsl          | 30 +++++++++++++++++++
 .../en/xslt/MARC21slim2OPACDetail.xsl         | 24 +++++++++++++--
 .../bootstrap/en/xslt/MARC21slimUtils.xsl     | 30 +++++++++++++++++++
 4 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 88f60ae598..8587667d30 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -215,7 +215,12 @@
                         <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:controlfield[@tag=001], true())"/>+AND+(bib-level:a+OR+bib-level:b)</xsl:attribute>
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Host-item:(<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/>)</xsl:attribute>
+                        <xsl:variable name="title_query">
+                            <xsl:call-template name="fix_query_term">
+                                <xsl:with-param name="term"><xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='a']"/></xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Host-item:("<xsl:value-of select="$title_query"/>")</xsl:attribute>
                     </xsl:otherwise>
                 </xsl:choose>
                 <xsl:text>Show analytics</xsl:text>
@@ -1083,8 +1088,23 @@
                             </a>
                         </xsl:when>
                         <xsl:otherwise>
+                            <xsl:variable name="title_query">
+                                <xsl:call-template name="fix_query_term">
+                                    <xsl:with-param name="term"><xsl:value-of select="marc:subfield[@code='t']"/></xsl:with-param>
+                                </xsl:call-template>
+                            </xsl:variable>
+                            <xsl:variable name="author_query">
+                                <xsl:if test="marc:subfield[@code='a']">
+                                    <xsl:call-template name="fix_query_term">
+                                        <xsl:with-param name="term">
+                                            <xsl:value-of select="marc:subfield[@code='a']"/>
+                                        </xsl:with-param>
+                                    </xsl:call-template>
+                                </xsl:if>
+                            </xsl:variable>
                             <a>
-                                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='t'], '()', ''), true())"/><xsl:if test="marc:subfield[@code='a']">+AND+au:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'], '()', ''), true())"/></xsl:if></xsl:attribute>
+                            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:("<xsl:value-of select="$title_query" />")<xsl:if test="$author_query">+AND+au:("<xsl:value-of select="$author_query"/>")</xsl:if>
+                            </xsl:attribute>
                                 <xsl:value-of select="$f773"/>
                             </a>
                         </xsl:otherwise>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
index dfc9cc0186..18f9f453a3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
@@ -578,6 +578,36 @@
         </xsl:if>
     </xsl:template>
 
+    <xsl:template name="fix_query_term">
+        <xsl:param name="term" />
+        <xsl:variable name="fixed_term">
+            <xsl:call-template name="escape_quotes">
+                <xsl:with-param name="text">
+                    <xsl:value-of select="$term"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="str:encode-uri(translate($fixed_term, '()', ''), true())"/>
+    </xsl:template>
+
+    <xsl:template name="escape_quotes">
+        <xsl:param name="text"/>
+        <xsl:choose>
+            <xsl:when test="contains($text, '&quot;')">
+                <xsl:variable name="before" select="substring-before($text,'&quot;')"/>
+                <xsl:variable name="next" select="substring-after($text,'&quot;')"/>
+                <xsl:value-of select="$before"/>
+                <xsl:text>\&quot;</xsl:text>
+                <xsl:call-template name="escape_quotes">
+                    <xsl:with-param name="text" select="$next"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
 </xsl:stylesheet>
 
 <!-- Stylus Studio meta-information - (c)1998-2002 eXcelon Corp.
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 8f02316945..cebbbd0c01 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -257,7 +257,12 @@
                         <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=rcn:<xsl:value-of select="str:encode-uri(marc:controlfield[@tag=001], true())"/>+AND+(bib-level:a+OR+bib-level:b)</xsl:attribute>
                     </xsl:when>
                     <xsl:otherwise>
-                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Host-item:(<xsl:value-of select="str:encode-uri(translate(marc:datafield[@tag=245]/marc:subfield[@code='a'], '/', ''), true())"/>)</xsl:attribute>
+                        <xsl:variable name="title_query">
+                            <xsl:call-template name="fix_query_term">
+                                <xsl:with-param name="term"><xsl:value-of select="marc:datafield[@tag=245]/marc:subfield[@code='a']"/></xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Host-item:("<xsl:value-of select="$title_query"/>")</xsl:attribute>
                     </xsl:otherwise>
                 </xsl:choose>
                 <xsl:text>Show analytics</xsl:text>
@@ -1230,8 +1235,23 @@
                             </a>
                         </xsl:when>
                         <xsl:otherwise>
+                            <xsl:variable name="title_query">
+                                <xsl:call-template name="fix_query_term">
+                                    <xsl:with-param name="term"><xsl:value-of select="marc:subfield[@code='t']"/></xsl:with-param>
+                                </xsl:call-template>
+                            </xsl:variable>
+                            <xsl:variable name="author_query">
+                                <xsl:if test="marc:subfield[@code='a']">
+                                    <xsl:call-template name="fix_query_term">
+                                        <xsl:with-param name="term">
+                                            <xsl:value-of select="marc:subfield[@code='a']"/>
+                                        </xsl:with-param>
+                                    </xsl:call-template>
+                                </xsl:if>
+                            </xsl:variable>
                             <a>
-                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='t'], '()', ''), true())"/><xsl:if test="marc:subfield[@code='a']">+AND+au:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'], '()', ''), true())"/></xsl:if></xsl:attribute>
+                            <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:("<xsl:value-of select="$title_query" />")<xsl:if test="$author_query">+AND+au:("<xsl:value-of select="$author_query"/>")</xsl:if>
+                            </xsl:attribute>
                                 <xsl:value-of select="$f773"/>
                             </a>
                         </xsl:otherwise>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
index 105da508c7..8b793db430 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
@@ -542,6 +542,36 @@
         </xsl:if>
     </xsl:template>
 
+    <xsl:template name="fix_query_term">
+        <xsl:param name="term" />
+        <xsl:variable name="fixed_term">
+            <xsl:call-template name="escape_quotes">
+                <xsl:with-param name="text">
+                    <xsl:value-of select="$term"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:value-of select="str:encode-uri(translate($fixed_term, '()', ''), true())"/>
+    </xsl:template>
+
+    <xsl:template name="escape_quotes">
+        <xsl:param name="text"/>
+        <xsl:choose>
+            <xsl:when test="contains($text, '&quot;')">
+                <xsl:variable name="before" select="substring-before($text,'&quot;')"/>
+                <xsl:variable name="next" select="substring-after($text,'&quot;')"/>
+                <xsl:value-of select="$before"/>
+                <xsl:text>\&quot;</xsl:text>
+                <xsl:call-template name="escape_quotes">
+                    <xsl:with-param name="text" select="$next"/>
+                </xsl:call-template>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="$text"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
 </xsl:stylesheet>
 
 <!-- Stylus Studio meta-information - (c)1998-2002 eXcelon Corp.
-- 
2.30.2