Attachment 51045 Details for Bug 16343 – Bug 16343: 7XX XSLT subfields displaying out of order

[patch] Bug 16343: 7XX XSLT subfields displaying out of order

Bug-16343-7XX-XSLT-subfields-displaying-out-of-ord.patch (text/plain), 7.50 KB, created by Danielle Elder on 2016-04-29 22:06:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Danielle Elder

Created: 2016-04-29 22:06:16 UTC

Size: 7.50 KB

patch

obsolete

>From 28d7fcf03c47d3d6da7bfdb953eddbcb57cf3993 Mon Sep 17 00:00:00 2001
>From: Hector Castro <hector.hecaxmmx@gmail.com>
>Date: Thu, 28 Apr 2016 13:34:13 -0600
>Subject: [PATCH] Bug 16343: 7XX XSLT subfields displaying out of order
>
>Patch apply for OPAC: This patch respect previous css classes
>.authordates and .relatorcode but also include .titleportion
>
>.authordates {display: none;}
>.titleportion {display: none;}
>.relatorcode {display: none;}
>
>To test:
>- Stage the record attached
>- Reindex zebra
>- Leave empty the OPACUserCSS syspref
>- Go to the new record in OPAC detail page
>- Look the wrong display of dates
>- Apply patch and refresh the page
>- Test in OPACUserCSS the css stated before
>- Play deleting or adding the clasess
>
>Signed-off-by: Dani Elder <danielle@bywatersolutions.com>
>---
> .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 76 +++++++++++++++-----
> 1 file changed, 57 insertions(+), 19 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>index d3473e0..b17530b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>@@ -1295,7 +1295,7 @@
> <xsl:with-param name="codes">
> <xsl:choose>
> 
>- <xsl:when test="@tag=111">abceqt</xsl:when>
>+ <xsl:when test="@tag=111">abcdeqt</xsl:when>
> <xsl:otherwise>abcjqt</xsl:otherwise>
> </xsl:choose>
> </xsl:with-param>
>@@ -1309,36 +1309,74 @@
> 
> 
> <xsl:when test="@tag=700 or @tag=710 or @tag=711">
>- <xsl:variable name="str">
>+ 
>+ <xsl:if test="@tag=710 or @tag=711">
>+ <xsl:call-template name="chopPunctuation">
>+ <xsl:with-param name="chopString">
>+ <xsl:call-template name="subfieldSelect">
>+ <xsl:with-param name="codes">
>+ <xsl:choose>
>+ <xsl:when test="@tag=711">acdent</xsl:when>
>+ <xsl:otherwise>abcdnt</xsl:otherwise>
>+ </xsl:choose>
>+ </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:with-param>
>+ <xsl:with-param name="punctuation">
>+ <xsl:text>:,;/ </xsl:text>
>+ </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
>+ <xsl:if test="@tag=700">
>+ <xsl:call-template name="chopPunctuation">
>+ <xsl:with-param name="chopString">
>+ <xsl:call-template name="subfieldSelect">
>+ <xsl:with-param name="codes">abcq</xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
>+ <xsl:if test="@tag=700 and marc:subfield[@code='d']">
>+ 
>+ <xsl:text>, </xsl:text>
>+ <xsl:call-template name="chopPunctuation">
>+ <xsl:with-param name="chopString">
> <xsl:call-template name="subfieldSelect">
>- <xsl:with-param name="codes">abcfghiklmnoprstux</xsl:with-param>
>+ <xsl:with-param name="codes">d</xsl:with-param>
> </xsl:call-template>
>- </xsl:variable>
>+ </xsl:with-param>
>+ </xsl:call-template>
>+ 
>+ </xsl:if>
>+ 
>+ <xsl:if test="@tag=700">
>+ 
>+ <xsl:text>. </xsl:text>
> <xsl:call-template name="chopPunctuation">
> <xsl:with-param name="chopString">
>- <xsl:value-of select="$str"/>
>- </xsl:with-param>
>- <xsl:with-param name="punctuation">
>- <xsl:text>:,;/. </xsl:text>
>+ <xsl:call-template name="subfieldSelect">
>+ <xsl:with-param name="codes">fghjklmnoprstux</xsl:with-param>
>+ </xsl:call-template>
> </xsl:with-param>
> </xsl:call-template>
>+ 
>+ </xsl:if>
>+
> </xsl:when>
> </xsl:choose>
> 
>- <xsl:if test="marc:subfield[@code='d']">
>- 
>- <xsl:text> </xsl:text>
>- <xsl:value-of select="marc:subfield[@code='d']"/>
>- 
>- </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'][. != ''])">
>+
> 
> <xsl:text> [</xsl:text>
> <xsl:choose>
>- <xsl:when test="@tag=111">
>+ <xsl:when test="@tag=111 or @tag=711">
> <xsl:choose>
>- 
>+ 
> <xsl:when test="marc:subfield[@code='j']">
> <xsl:for-each select="marc:subfield[@code='j']">
> <xsl:value-of select="."/>
>@@ -1353,8 +1391,8 @@
> </xsl:otherwise>
> </xsl:choose>
> </xsl:when>
>- 
>- <xsl:when test="marc:subfield[@code='e']">
>+ 
>+ <xsl:when test="marc:subfield[@code='e'][not(@tag=111) or not(@tag=711)]">
> <xsl:for-each select="marc:subfield[@code='e']">
> <xsl:value-of select="."/>
> <xsl:if test="position() != last()">, </xsl:if>
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 16343: 50667 | 50950 | 50952 | 51045 | 51118 | 51119 | 51190 | 51225 | 51226 | 51613