From d62669f7ca59b7f1b1a1ae73d5d7213616e0e7e7 Mon Sep 17 00:00:00 2001
From: Winona Salesky <wsalesky@gmail.com>
Date: Thu, 11 Jun 2015 22:00:16 -0400
Subject: [PATCH] [SIGNED OFF] Bug 13600 - XSLT: 8xx not showing if there is no
 4xx

Removes dependency on 490 ind1 for 8xx display. 8xx will always display.

Test Plan:
1) Apply this patch
2) Ensure you are using the default XSLT setting for the staff and opac details view.
3) Find or create a record with MARC tags 800, 810, 830
4) Check display of 8xx tags, should always display if present in the record.
6) Repeat test for the staff interface

Signed-off-by: Nick Clemens <nick@quecheelibrary.org>
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl             | 11 +++++------
 .../opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl  | 14 +++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index d077e35..316e75e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -176,7 +176,7 @@
         </xsl:if>
         
         <!-- Series -->
-        <xsl:if test="marc:datafield[@tag=440 or @tag=490]">
+        <xsl:if test="marc:datafield[@tag=440 or @tag=490 or @tag=800 or @tag=810 or @tag=811 or @tag=830]">
         <span class="results_summary series"><span class="label">Series: </span>
         <!-- 440 -->
         <xsl:for-each select="marc:datafield[@tag=440]">
@@ -207,9 +207,8 @@
                     <xsl:call-template name="part"/>
         <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>
-        <!-- 490 Series traced, Ind1 = 1 -->
-        <xsl:if test="marc:datafield[@tag=490][@ind1=1]">
-            <xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
+        <!-- 800,810,811,830 always display. -->
+        <xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
                 <xsl:choose>
                     <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
                         <a href="/cgi-bin/koha/catalogue/search.pl?q=rcn:{marc:subfield[@code='w']}">
@@ -238,8 +237,8 @@
                 <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><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-            </xsl:for-each>
-        </xsl:if>
+        </xsl:for-each>
+
 
         </span>
         </xsl:if>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 8b7d559..b24a4fa 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -199,7 +199,7 @@
         </xsl:if>
 
         <!-- Series -->
-        <xsl:if test="marc:datafield[@tag=440 or @tag=490]">
+        <xsl:if test="marc:datafield[@tag=440 or @tag=490 or @tag=800 or @tag=810 or @tag=811 or @tag=830]">
         <span class="results_summary series"><span class="label">Series: </span>
         <!-- 440 -->
         <xsl:for-each select="marc:datafield[@tag=440]">
@@ -227,12 +227,12 @@
                             </xsl:with-param>
                         </xsl:call-template>
             </a>
-                    <xsl:call-template name="part"/>
+            <xsl:call-template name="part"/>
         <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>
-        <!-- 490 Series traced, Ind1 = 1 -->
-        <xsl:if test="marc:datafield[@tag=490][@ind1=1]">
-            <xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
+
+        <!-- 800,810,811,830 always display. -->
+        <xsl:for-each select="marc:datafield[@tag=800 or @tag=810 or @tag=811 or @tag=830]">
                 <xsl:choose>
                     <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
                         <a href="/cgi-bin/koha/opac-search.pl?q=rcn:{marc:subfield[@code='w']}">
@@ -261,8 +261,8 @@
                 <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><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-            </xsl:for-each>
-        </xsl:if>
+        </xsl:for-each>
+
         </span>
         </xsl:if>
 
-- 
1.9.1