From a94ddd25e72ea0447c7509875f0a5f2051ef8e79 Mon Sep 17 00:00:00 2001
From: Blou <blou@inlibro.com>
Date: Mon, 6 Dec 2021 13:48:30 -0500
Subject: [PATCH] Bug 15594: preserve sequence of 260 subfields in detail page

When ordered $a$b$a$b$c in the MARC object, 260 subfields are displayed
$a$a$b$b$c.  This goes against the standard.

This patch preserves the order.

0) create a notice with $a$b$a subfields.  In that (mixed) order.
1) Go to detail page and see the fields displayed as "aab"
2) apply the patch
3) validate the aba display.

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 .../en/xslt/MARC21slim2OPACDetail.xsl         | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 4e507a5754..800b724069 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -325,53 +325,53 @@
             <xsl:when test="marc:datafield[@tag=260]">
              <span class="results_summary publisher"><span class="label">Publication details: </span>
                  <xsl:for-each select="marc:datafield[@tag=260]">
-                     <span property="publisher" typeof="Organization">
-                         <xsl:for-each select="marc:subfield[@code='a']">
+                     <xsl:for-each select="marc:subfield">
+                     <xsl:if test="@code='a'">
+                         <span property="publisher" typeof="Organization">
                             <span class="publisher_place" property="location">
                                 <a>
-                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=pl:"<xsl:value-of select="str:encode-uri(., true())"/>"</xsl:attribute>
-                                    <xsl:value-of select="."/>
+                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=pl:"<xsl:value-of select="str:encode-uri(current(), true())"/>"</xsl:attribute>
+                                    <xsl:value-of select="current()"/>
                                 </a>
                             </span>
+                         </span>
                             <xsl:if test="position() != last()">
                                 <xsl:text> </xsl:text>
                             </xsl:if>
-                         </xsl:for-each>
-                     <xsl:text> </xsl:text>
-                     <xsl:if test="marc:subfield[@code='b']">
+                         <xsl:text> </xsl:text>
+                     </xsl:if>
+                     <xsl:if test="@code='b'">
+                         <span property="publisher" typeof="Organization">
                         <span property="name" class="publisher_name">
-                            <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Provider:<xsl:value-of select="str:encode-uri(marc:subfield[@code='b'], true())"/></xsl:attribute>
-                                <xsl:call-template name="subfieldSelect">
-                                    <xsl:with-param name="codes">b</xsl:with-param>
-                                </xsl:call-template>
+                            <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Provider:<xsl:value-of select="str:encode-uri(current(), true())"/></xsl:attribute>
+                                <xsl:value-of select="current()"/>
                             </a>
                         </span>
+                        </span>
+                        <xsl:text> </xsl:text>
                      </xsl:if>
-                     </span>
-                     <xsl:text> </xsl:text>
-                     <xsl:for-each select="marc:subfield[@code='c']">
+                     <xsl:if test="@code='c'">
                          <span property="datePublished" class="publisher_date">
                              <a>
-                                 <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=copydate:"<xsl:value-of select="str:encode-uri(., true())"/>"</xsl:attribute>
-                                 <xsl:value-of select="."/>
+                                 <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=copydate:"<xsl:value-of select="str:encode-uri(current(), true())"/>"</xsl:attribute>
+                                 <xsl:value-of select="current()"/>
                              </a>
                              <xsl:if test="position() != last()">
                                  <xsl:text> </xsl:text>
                              </xsl:if>
                          </span>
-                     </xsl:for-each>
-                     <xsl:text> </xsl:text>
-                     <xsl:if test="marc:subfield[@code='g']">
+                         <xsl:text> </xsl:text>
+                     </xsl:if>
+                     <xsl:if test="@code='g'">
                         <span property="datePublished" class="publisher_date">
                            <xsl:call-template name="chopPunctuation">
                                <xsl:with-param name="chopString">
-                                    <xsl:call-template name="subfieldSelect">
-                                        <xsl:with-param name="codes">g</xsl:with-param>
-                                    </xsl:call-template>
+                                 <xsl:value-of select="current()"/>
                                 </xsl:with-param>
                             </xsl:call-template>
                         </span>
                      </xsl:if>
+                     </xsl:for-each>
                      <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
                  </xsl:for-each>
              </span>
-- 
2.39.5