From 80993795ddf7c7b3c37262dc5f10a9771e5eaa37 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Mon, 21 Sep 2020 04:49:48 +0000
Subject: [PATCH] Bug 11223: Fix the ind1 semantics for 785 in the staff
 interface

For 780 and 785 the field should not display when the first indicator
is 1. After checking the code, I found that 785 in staff was missing.
This patches fixes that one.

To test:
- Catalog a record with 785 and 780 fields with one 1st indicator set to
  0 and another to 1.
- Verify in staff and OPAC detail pages that only the fields with 0 display.

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 .../en/xslt/MARC21slim2intranetDetail.xsl     | 112 +++++++++---------
 1 file changed, 57 insertions(+), 55 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index b1bef27766..469217f8cd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -1310,65 +1310,67 @@
         <!-- 785 -->
         <xsl:if test="marc:datafield[@tag=785]">
             <xsl:for-each select="marc:datafield[@tag=785]">
-                <span class="results_summary succeeding_entry">
-                    <xsl:choose>
-                        <xsl:when test="@ind2=0">
-                            <span class="label">Continued by:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=1">
-                            <span class="label">Continued in part by:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=2">
-                            <span class="label">Superseded by:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=3">
-                            <span class="label">Superseded in part by:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=4">
-                            <span class="label">Absorbed by:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=5">
-                            <span class="label">Absorbed in part by:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=6">
-                            <span class="label">Split into .. and ...:</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=7">
-                            <span class="label">Merged with ... to form ...</span>
-                        </xsl:when>
-                        <xsl:when test="@ind2=8">
-                            <span class="label">Changed back to:</span>
-                        </xsl:when>
-                    </xsl:choose>
-                    <xsl:text> </xsl:text>
+                <xsl:if test="@ind1=0">
+                    <span class="results_summary succeeding_entry">
+                        <xsl:choose>
+                            <xsl:when test="@ind2=0">
+                                <span class="label">Continued by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=1">
+                                <span class="label">Continued in part by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=2">
+                                <span class="label">Superseded by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=3">
+                                <span class="label">Superseded in part by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=4">
+                                <span class="label">Absorbed by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=5">
+                                <span class="label">Absorbed in part by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=6">
+                                <span class="label">Split into .. and ...:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=7">
+                                <span class="label">Merged with ... to form ...</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=8">
+                                <span class="label">Changed back to:</span>
+                            </xsl:when>
+                        </xsl:choose>
+                        <xsl:text> </xsl:text>
 
-                    <xsl:if test="marc:subfield[@code='i']">
-                        <span class="785_rel_info">
-                            <xsl:value-of select="marc:subfield[@code='i']"/>
-                            <xsl:text> </xsl:text>
-                        </span>
-                    </xsl:if>
+                        <xsl:if test="marc:subfield[@code='i']">
+                            <span class="785_rel_info">
+                                <xsl:value-of select="marc:subfield[@code='i']"/>
+                                <xsl:text> </xsl:text>
+                            </span>
+                        </xsl:if>
 
-                    <xsl:variable name="f785">
-                        <xsl:call-template name="subfieldSelect">
-                            <xsl:with-param name="codes">a_t</xsl:with-param>
-                        </xsl:call-template>
-                    </xsl:variable>
+                        <xsl:variable name="f785">
+                            <xsl:call-template name="subfieldSelect">
+                                <xsl:with-param name="codes">a_t</xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:variable>
 
-                    <xsl:choose>
-                        <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
-                            <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                                <xsl:value-of select="$f785"/>
-                            </a>
-                        </xsl:when>
-                        <xsl:otherwise>
-                            <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
-                                <xsl:value-of select="$f785"/>
-                            </a>
-                        </xsl:otherwise>
-                    </xsl:choose>
+                        <xsl:choose>
+                            <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
+                                <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
+                                    <xsl:value-of select="$f785"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
+                                    <xsl:value-of select="$f785"/>
+                                </a>
+                            </xsl:otherwise>
+                        </xsl:choose>
 
-                </span>
+                    </span>
+                </xsl:if>
             </xsl:for-each>
         </xsl:if>
 
-- 
2.39.5