From 36dc3d448c28d4026bb1b5feab174447ea53e1aa Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 3 Nov 2022 09:41:31 +0000
Subject: [PATCH] Bug 13600: (follow-up) Add seperator on the OPAC

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../bootstrap/en/xslt/MARC21slimUtils.xsl         | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
index 52c53a4de0..b1afb43616 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl
@@ -391,7 +391,7 @@
             </xsl:if>
             <xsl:choose>
                 <xsl:when test="position()=last()">
-                    <xsl:if test="../marc:datafield[@tag=490][@ind1!=1]">
+                    <xsl:if test="../marc:datafield[@tag=490][@ind1!=1] or ../marc:datafield[(@tag=800 or @tag=810 or @tag=811) and @ind1!='z'] or ../marc:datafield[@tag=830 and @ind1!='z']">
                         <span class="separator"> | </span>
                     </xsl:if>
                 </xsl:when>
@@ -416,7 +416,7 @@
             </xsl:if>
             <xsl:choose>
                 <xsl:when test="position()=last()">
-                    <xsl:if test="../marc:datafield[@tag=490][@ind1=1]">
+                    <xsl:if test="../marc:datafield[(@tag=800 or @tag=810 or @tag=811) and @ind1!='z'] or ../marc:datafield[@tag=830 and @ind1!='z']">
                         <span class="separator"> | </span>
                     </xsl:if>
                 </xsl:when>
@@ -463,7 +463,16 @@
             <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:choose>
+            <xsl:when test="position()=last()">
+                <xsl:if test="../marc:datafield[@tag=830 and @ind1!='z']">
+                    <span class="separator"> | </span>
+                </xsl:if>
+            </xsl:when>
+            <xsl:otherwise>
+                <span class="separator"> | </span>
+            </xsl:otherwise>
+        </xsl:choose>
         </xsl:for-each>
 
         <xsl:for-each select="marc:datafield[@tag=830 and @ind1!='z']">
-- 
2.39.2