From 96c490517242c987ee5049e5b7e4d9c9e9f45cf7 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 22 Aug 2021 03:29:47 +0000
Subject: [PATCH] Bug 10265: Keep punctuation for 8xx series added entry fields
 (MARC21)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

At the moment the punctuation entered for $n $p and is
removed in the part template, which leads to displaying the subfields
without any punctuation and spaces in between.

To test:
- Catalog records with various combinations of 8xx series added
  entry fields. Subfield a, t, n, p and v are the most important.
- Verify the display in OPAC and staff is not great.
- Apply the patch.
- Verify the display in OPAC and staff is improved.

For examples see:
https://www.loc.gov/marc/bibliographic/bd80x83x.html

Important note: At the moment 8xx series added entry fields will only display, when
there is also a 490 ind. 1 = 1 field present.

Signed-off-by: Hayley Pelham <hayleypelham@catalyst.net.nz>

Signed-off-by: Joonas Kylmälä <joonas.kylmala@iki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../prog/en/xslt/MARC21slimUtils.xsl           | 16 ++++++++--------
 .../bootstrap/en/xslt/MARC21slimUtils.xsl      | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
index 1916a711dd..c9678499f0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl
@@ -495,9 +495,9 @@
                                 </xsl:with-param>
                             </xsl:call-template>
                         </a>
-                        <xsl:call-template name="part"/>
                     </xsl:otherwise>
                 </xsl:choose>
+                <xsl:call-template name="part"/>
                 <xsl:text> ; </xsl:text>
                 <xsl:value-of  select="marc:subfield[@code='v']" />
             <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"> | </span></xsl:otherwise></xsl:choose>
@@ -537,9 +537,9 @@
                                 </xsl:with-param>
                             </xsl:call-template>
                         </a>
-                        <xsl:call-template name="part"/>
                     </xsl:otherwise>
                 </xsl:choose>
+                <xsl:call-template name="part"/>
                 <xsl:if test="marc:subfield[@code='v']">
                     <xsl:text> ; </xsl:text><xsl:value-of select="marc:subfield[@code='v']" />
                 </xsl:if>
@@ -566,15 +566,15 @@
                 <xsl:with-param name="afterCodes">fghkdlmor</xsl:with-param>
             </xsl:call-template>
         </xsl:variable>
+        <xsl:if test="$partNumber != '' or $partName != ''" >
+            <xsl:text>. </xsl:text>
+        </xsl:if>
         <xsl:if test="string-length(normalize-space($partNumber))">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString" select="$partNumber"/>
-                </xsl:call-template>
+            <xsl:value-of select="$partNumber" />
         </xsl:if>
+        <xsl:if test="$partNumber != ''"><xsl:text> </xsl:text></xsl:if>
         <xsl:if test="string-length(normalize-space($partName))">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString" select="$partName"/>
-                </xsl:call-template>
+            <xsl:value-of select="$partName" />
         </xsl:if>
     </xsl:template>
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
index 13e70d0ee8..4e918ea174 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
@@ -459,10 +459,10 @@
                                 </xsl:with-param>
                             </xsl:call-template>
                         </a>
-                        <xsl:call-template name="part"/>
                     </xsl:otherwise>
                 </xsl:choose>
-                <xsl:text>: </xsl:text>
+                <xsl:call-template name="part"/>
+                <xsl:text> ; </xsl:text>
                 <xsl:value-of  select="marc:subfield[@code='v']" />
             <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"> | </span></xsl:otherwise></xsl:choose>
             </xsl:for-each>
@@ -501,9 +501,9 @@
                                 </xsl:with-param>
                             </xsl:call-template>
                         </a>
-                        <xsl:call-template name="part"/>
                     </xsl:otherwise>
                 </xsl:choose>
+                <xsl:call-template name="part"/>
                 <xsl:if test="marc:subfield[@code='v']">
                     <xsl:text> ; </xsl:text><xsl:value-of select="marc:subfield[@code='v']" />
                 </xsl:if>
@@ -530,15 +530,15 @@
                 <xsl:with-param name="afterCodes">fghkdlmor</xsl:with-param>
             </xsl:call-template>
         </xsl:variable>
+        <xsl:if test="$partNumber != '' or $partName != ''" >
+            <xsl:text>. </xsl:text>
+        </xsl:if>
         <xsl:if test="string-length(normalize-space($partNumber))">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString" select="$partNumber"/>
-                </xsl:call-template>
+            <xsl:value-of select="$partNumber" />
         </xsl:if>
+        <xsl:if test="$partNumber != ''"><xsl:text> </xsl:text></xsl:if>
         <xsl:if test="string-length(normalize-space($partName))">
-                <xsl:call-template name="chopPunctuation">
-                    <xsl:with-param name="chopString" select="$partName"/>
-                </xsl:call-template>
+            <xsl:value-of select="$partName" />
         </xsl:if>
     </xsl:template>
 
-- 
2.39.5