From 4e350b49e2545211e2d233b0fef9948a7a416b22 Mon Sep 17 00:00:00 2001
From: Winona Salesky <wsalesky@gmail.com>
Date: Thu, 26 Mar 2015 11:21:54 -0400
Subject: [PATCH] RDA: 100/110/111 changes to XSLT

Test plan:
1) Apply this patch
2) Ensure you are using the default XSLT setting for the staff and opac search results and record details
3) Find or create a record with MARC tags 100,110,111
4) Perform an opac search that would show the record in the search results.
5) Click title to review record.
6) Note the fields updates 100,110,111 to show subfields a,b,c,d,q and t.Multiple fields are separated by span class=separator |.
7) Repeat steps 4 - 6 for the staff interface

http://bugs.koha-community.org/show_bug.cgi?id=13383
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     | 30 +++++++++++++---------
 .../prog/en/xslt/MARC21slim2intranetResults.xsl    | 19 +++++++++-----
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    | 23 +++++++++++------
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl   | 19 +++++++++-----
 4 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 221a2eb..77cda90 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -997,19 +997,25 @@
                 </xsl:with-param>                
             </xsl:call-template>
 
-    	<!-- add relator code too between brackets-->
             <!-- #13383 include relator code j for field 111 -->
-        	<xsl:if test="marc:subfield[@code='4' or @code='e' or @code='j']">
-              <span class="relatorcode">
-              <xsl:text> [</xsl:text>
-        	  <xsl:choose>
-        	      <xsl:when test="@tag=111"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
-        	      <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-        	      <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
-        	  </xsl:choose>
-        	  <xsl:text>]</xsl:text>
-              </span>
-        	</xsl:if>
+            <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
+                <span class="relatorcode">
+                    <xsl:text> [</xsl:text>
+                    <xsl:choose>
+                        <xsl:when test="@tag=111">
+                            <xsl:choose>
+                                <!-- Prefer j over 4 -->
+                                <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
+                                <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:when>
+                        <!-- Prefer e over 4 -->
+                        <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
+                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
+                    </xsl:choose>
+                    <xsl:text>]</xsl:text>
+                </span>
+            </xsl:if>
 	       </a>
         <xsl:choose>
             <!-- #13383 added separator with span -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index aed2fc9..48aabba 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -364,8 +364,9 @@
             <span class="relatorcode">
                 <xsl:text> [</xsl:text>
                 <xsl:choose>
-                    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
+                    <!-- Prefer e over 4 -->
+                    <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
                 </xsl:choose>
                 <xsl:text>]</xsl:text>
             </span>
@@ -400,8 +401,9 @@
             <span class="relatorcode">
                 <xsl:text> [</xsl:text>
                 <xsl:choose>
-                    <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
+                    <!-- Prefer e over 4 -->
+                    <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
                 </xsl:choose>
                 <xsl:text>]</xsl:text>
             </span>
@@ -441,9 +443,14 @@
                 <xsl:text>:,;/ </xsl:text>
             </xsl:with-param>                
         </xsl:call-template></a>
-        <xsl:if test="marc:subfield[@code='j']">
+        <xsl:if test="marc:subfield[@code='4' or @code='j'][. != '']">
             <span class="relatorcode">
-                <xsl:text> [</xsl:text><xsl:value-of select="marc:subfield[@code='j']"/>
+                <xsl:text> [</xsl:text>
+                <xsl:choose>
+                    <!-- Prefer j over 4 -->
+                    <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
+                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
+                </xsl:choose>
                 <xsl:text>]</xsl:text>
             </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 0dab452..0701945 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1105,15 +1105,22 @@
                     </xsl:call-template>
                 </span></span></span>
                 <!-- #13383 include relator code j for field 111 -->
-                <xsl:if test="marc:subfield[@code='4' or @code='e' or @code='j']">
+                <xsl:if test="marc:subfield[@code='4' or @code='e'][not(parent::*[@tag=111])] or (self::*[@tag=111] and marc:subfield[@code='4' or @code='j'][. != ''])">
                     <span class="relatorcode">
-                    <xsl:text> [</xsl:text>
-                    <xsl:choose>
-                        <xsl:when test="@tag=111"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
-                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
-                    </xsl:choose>
-                    <xsl:text>]</xsl:text>
+                        <xsl:text> [</xsl:text>
+                        <xsl:choose>
+                            <xsl:when test="@tag=111">
+                                <xsl:choose>
+                                    <!-- Prefer j over 4 -->
+                                    <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
+                                    <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
+                                </xsl:choose>
+                            </xsl:when>
+                            <!-- Prefer e over 4 -->
+                            <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
+                            <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
+                        </xsl:choose>
+                        <xsl:text>]</xsl:text>
                     </span>
                 </xsl:if>
             </a>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 951a627..8f4bdff 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -469,8 +469,9 @@
                 <span class="relatorcode">
                     <xsl:text> [</xsl:text>
                     <xsl:choose>
-                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
+                        <!-- Prefer e over 4 -->
+                        <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
+                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
                     </xsl:choose>
                     <xsl:text>]</xsl:text>
                 </span>
@@ -501,8 +502,9 @@
                 <span class="relatorcode">
                     <xsl:text> [</xsl:text>
                     <xsl:choose>
-                        <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
-                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
+                        <!-- Prefer e over 4 -->
+                        <xsl:when test="marc:subfield[@code='e']"><xsl:value-of select="marc:subfield[@code='e']"/></xsl:when>
+                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
                     </xsl:choose>
                     <xsl:text>]</xsl:text>
                 </span>
@@ -527,9 +529,14 @@
                     <xsl:text>:,;/ </xsl:text>
                 </xsl:with-param>                
             </xsl:call-template>
-            <xsl:if test="marc:subfield[@code='j']">
+            <xsl:if test="marc:subfield[@code='4' or @code='j'][. != '']">
                 <span class="relatorcode">
-                    <xsl:text> [</xsl:text><xsl:value-of select="marc:subfield[@code='j']"/>
+                    <xsl:text> [</xsl:text>
+                    <xsl:choose>
+                        <!-- Prefer j over 4 -->
+                        <xsl:when test="marc:subfield[@code='j'][. != '']"><xsl:value-of select="marc:subfield[@code='j']"/></xsl:when>
+                        <xsl:otherwise><xsl:value-of select="marc:subfield[@code='4']"/></xsl:otherwise>
+                    </xsl:choose>
                     <xsl:text>]</xsl:text>
                 </span>
             </xsl:if>
-- 
1.9.5 (Apple Git-50.3)