From 782656207353e72a15a185b9e06578d13747d875 Mon Sep 17 00:00:00 2001
From: David Roberts <david@koha-ptfs.co.uk>
Date: Mon, 6 Apr 2020 23:42:19 +0000
Subject: [PATCH] Bug 23119: MARC21 added title 246, 730 subfield i displays
 out of order, and should display before subfield a

This patch makes the subfield i display before subfield a in the 246 and
730 fields

To test:

1) Create a bibliographic record with data in several subfields in tags
246 and 730.
2) See that subfield i displays at the end of the field in the 246
field, and probably not at all in the 730 field. Check in both the OPAC
and staff client
3) Apply the patch.
4) Check your bib record again in both clients. Subfield i should now
display before subfield a.

Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 8dea59bba0c620da41a47698e2142e61f1dba3f9)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl    | 15 ++++++++++++---
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl   | 15 ++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 04faadcfc1..7aff0f1ed3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -548,6 +548,12 @@
         <xsl:if test="marc:datafield[@tag=246]">
             <span class="results_summary other_title"><span class="label">Other title: </span>
                 <xsl:for-each select="marc:datafield[@tag=246]">
+                    <xsl:if test="marc:subfield[@code='i']">
+                            <xsl:call-template name="subfieldSelect">
+				    <xsl:with-param name="codes">i</xsl:with-param>
+			    </xsl:call-template>
+                    </xsl:if>
+                       <xsl:text> </xsl:text>
                     <xsl:call-template name="chopPunctuation">
                         <xsl:with-param name="chopString">
                             <xsl:call-template name="subfieldSelect">
@@ -568,9 +574,6 @@
                             <xsl:when test="@ind2=8"> [Spine title]</xsl:when>
                         </xsl:choose>
                     </xsl:if>
-                    <xsl:if test="marc:subfield[@code='i']">
-                        <xsl:value-of select="concat(' [',marc:subfield[@code='i'],']')"/>
-                    </xsl:if>
                     <!-- #13386 added separator | -->
                     <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose>
                 </xsl:for-each>
@@ -605,6 +608,12 @@
         <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
             <span class="results_summary uniform_title"><span class="label">Uniform titles: </span>
                 <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
+                    <xsl:if test="marc:subfield[@code='i']">
+			    <xsl:call-template name="subfieldSelect">
+				    <xsl:with-param name="codes">i</xsl:with-param>
+			    </xsl:call-template>
+		    </xsl:if>
+		    <xsl:text> </xsl:text>
                     <xsl:for-each select="marc:subfield">
                         <xsl:if test="contains('adfghklmnoprst',@code)">
                             <xsl:value-of select="text()"/>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 8240cbee58..9b64ec3445 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -617,6 +617,12 @@
                         <span property="alternateName">
                             <xsl:call-template name="chopPunctuation">
                                 <xsl:with-param name="chopString">
+                                    <xsl:if test="marc:subfield[@code='i']">
+					    <xsl:call-template name="subfieldSelect">
+						    <xsl:with-param name="codes">i</xsl:with-param>
+					    </xsl:call-template>
+                                    </xsl:if>
+				    <xsl:text> </xsl:text>
                                     <xsl:call-template name="subfieldSelect">
                                         <xsl:with-param name="codes">abhfgnp</xsl:with-param>
                                     </xsl:call-template>
@@ -635,9 +641,6 @@
                                     <xsl:when test="@ind2=8"> [Spine title]</xsl:when>
                                 </xsl:choose>
                             </xsl:if>
-                            <xsl:if test="marc:subfield[@code='i']">
-                                <xsl:value-of select="concat(' [',marc:subfield[@code='i'],']')"/>
-                            </xsl:if>
                         </span>
                         <!-- #13386 added separator | -->
                         <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose>
@@ -679,6 +682,12 @@
                 <span class="results_summary uniform_titles"><span class="label">Uniform titles: </span>
                     <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
                         <span property="alternateName">
+                            <xsl:if test="marc:subfield[@code='i']">
+				    <xsl:call-template name="subfieldSelect">
+					    <xsl:with-param name="codes">i</xsl:with-param>
+				    </xsl:call-template>
+                            </xsl:if>
+			    <xsl:text> </xsl:text>
                             <xsl:for-each select="marc:subfield">
                                 <xsl:if test="contains('adfghklmnoprst',@code)">
                                     <xsl:value-of select="text()"/>
-- 
2.20.1