Attachment 1432 Details for Bug 3567 – proposed patch

[patch] proposed patch

0001-Bug-3567-Display-Alternate-Graphic-Representation.patch (text/plain), 16.29 KB, created by Chris Cormack on 2009-09-01 08:55:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Cormack

Created: 2009-09-01 08:55:00 UTC

Size: 16.29 KB

patch

obsolete

>From a7f1fcafc444f0bbcb8919719af28e9c6a85fe26 Mon Sep 17 00:00:00 2001
>From: Wolfgang Heymans <wolfgang.heymans@bsz-bw.de>
>Date: Tue, 1 Sep 2009 10:28:06 +0200
>Subject: [PATCH] Bug 3567: Display Alternate Graphic Representation (MARC21 880) in OPAC
>Content-Type: text/plain; charset="utf-8"
>
>---
> .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 90 ++++++++++++++++++++
> .../prog/en/xslt/MARC21slim2OPACResults.xsl | 43 +++++++++
> .../opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 89 +++++++++++++++++++-
> 3 files changed, 221 insertions(+), 1 deletions(-)
>
>diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
>index 2e18e44..fe108e8 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
>@@ -12,6 +12,10 @@
> </xsl:template>
> 
> <xsl:template match="marc:record">
>+
>+ 
>+ <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
>+
> <xsl:variable name="leader" select="marc:leader"/>
> <xsl:variable name="leader6" select="substring($leader,7,1)"/>
> <xsl:variable name="leader7" select="substring($leader,8,1)"/>
>@@ -50,6 +54,16 @@
> </xsl:variable>
> 
> 
>+ 
>+ <xsl:if test="$display880">
>+ <h1 class="title">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">245</xsl:with-param>
>+ <xsl:with-param name="codes">abhfgknps</xsl:with-param>
>+ </xsl:call-template>
>+ </h1>
>+ </xsl:if>
>+
> <xsl:if test="marc:datafield[@tag=245]">
> <h1>
> <xsl:for-each select="marc:datafield[@tag=245]">
>@@ -75,6 +89,18 @@
> </h1>
> </xsl:if>
> 
>+ 
>+ <xsl:if test="$display880">
>+ <h5 class="author">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
>+ <xsl:with-param name="codes">abc</xsl:with-param>
>+ <xsl:with-param name="index">au</xsl:with-param>
>+ 
>+ </xsl:call-template>
>+ </h5>
>+ </xsl:if>
>+
> <xsl:choose>
> <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
> <h5 class="author">by
>@@ -138,6 +164,18 @@
> <xsl:value-of select="$materialTypeLabel"/>
> 
> </xsl:if>
>+
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">440,490</xsl:with-param>
>+ <xsl:with-param name="codes">av</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Series: </xsl:with-param>
>+ <xsl:with-param name="index">se</xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
> <xsl:if test="marc:datafield[@tag=440 or @tag=490]">
> Series: 
> <xsl:for-each select="marc:datafield[@tag=440]">
>@@ -169,6 +207,17 @@
> </xsl:for-each>
> 
> </xsl:if>
>+
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">260</xsl:with-param>
>+ <xsl:with-param name="codes">abcg</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Publisher: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
> <xsl:if test="marc:datafield[@tag=260]">
> Publisher: 
> <xsl:for-each select="marc:datafield[@tag=260]">
>@@ -183,6 +232,17 @@
> </xsl:for-each>
> 
> </xsl:if>
>+
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">250</xsl:with-param>
>+ <xsl:with-param name="codes">ab</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Edition: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
> <xsl:if test="marc:datafield[@tag=250]">
> Edition: 
> <xsl:for-each select="marc:datafield[@tag=250]">
>@@ -198,6 +258,16 @@
> 
> </xsl:if>
> 
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">300</xsl:with-param>
>+ <xsl:with-param name="codes">abceg</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Description: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
> <xsl:if test="marc:datafield[@tag=300]">
> Description: 
> <xsl:for-each select="marc:datafield[@tag=300]">
>@@ -234,6 +304,16 @@
> 
> </xsl:if>
> 
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">246</xsl:with-param>
>+ <xsl:with-param name="codes">abhfgnp</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Other Title: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+
> <xsl:if test="marc:datafield[@tag=246]">
> Other Title: 
> <xsl:for-each select="marc:datafield[@tag=246]">
>@@ -249,6 +329,16 @@
> 
> </xsl:if>
> 
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">130,240</xsl:with-param>
>+ <xsl:with-param name="codes">adfklmor</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Uniform Title: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+
> <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
> Uniform titles: 
> <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
>diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
>index c28ce17..6b1b823 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
>+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
>@@ -14,6 +14,10 @@
> <xsl:apply-templates/>
> </xsl:template>
> <xsl:template match="marc:record">
>+
>+ 
>+ <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/>
>+
> <xsl:variable name="leader" select="marc:leader"/>
> <xsl:variable name="leader6" select="substring($leader,7,1)"/>
> <xsl:variable name="leader7" select="substring($leader,8,1)"/>
>@@ -372,6 +376,16 @@
> </xsl:for-each>
> -->
> </xsl:variable>
>+
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">245</xsl:with-param>
>+ <xsl:with-param name="codes">abh</xsl:with-param>
>+ <xsl:with-param name="bibno"><xsl:value-of select="$biblionumber"/></xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+
> 	<a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
> 
> <xsl:if test="marc:datafield[@tag=245]">
>@@ -409,6 +423,15 @@
> </a>
> 
> 
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param>
>+ <xsl:with-param name="codes">abc</xsl:with-param>
>+ <xsl:with-param name="class">term</xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+
> <xsl:choose>
> <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
> 
>@@ -797,6 +820,16 @@
> </xsl:if>
> 	
> 
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">260</xsl:with-param>
>+ <xsl:with-param name="codes">abcg</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Publisher: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
> <xsl:if test="marc:datafield[@tag=260]">
> 	
> Publisher: 
>@@ -808,6 +841,16 @@
> 	
> </xsl:if>
> 
>+ 
>+ <xsl:if test="$display880">
>+ <xsl:call-template name="m880Select">
>+ <xsl:with-param name="basetags">246</xsl:with-param>
>+ <xsl:with-param name="codes">ab</xsl:with-param>
>+ <xsl:with-param name="class">results_summary</xsl:with-param>
>+ <xsl:with-param name="label">Other Title: </xsl:with-param>
>+ </xsl:call-template>
>+ </xsl:if>
>+ 
> <xsl:if test="marc:datafield[@tag=246]">
> 	
> Other title: 
>diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl
>index 917c10d..eed0e1f 100644
>--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl
>+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slimUtils.xsl
>@@ -64,7 +64,94 @@
> 		</xsl:choose>
> <xsl:text> </xsl:text>
> 	</xsl:template>
>-</xsl:stylesheet>
>+ <xsl:template name="m880Select">
>+ <xsl:param name="basetags"/> 
>+ <xsl:param name="codes"/> 
>+ <xsl:param name="class"/> 
>+ <xsl:param name="label"/> 
>+ <xsl:param name="bibno"/>
>+ <xsl:param name="index"/> 
>+
>+ <xsl:for-each select="marc:datafield[@tag=880]">
>+ <xsl:variable name="code6" select="marc:subfield[@code=6]"/>
>+ <xsl:if test="contains(string($basetags), substring($code6,1,3))">
>+ 
>+ <xsl:if test="boolean($class)">
>+ <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
>+ </xsl:if>
>+ <xsl:choose>
>+ 
>+ <xsl:when test="substring($code6,10,2) ='/r'">
>+ <xsl:attribute name="style">display:block; text-align:right; float:right; width:50%; padding-left:20px</xsl:attribute>
>+ <xsl:attribute name="dir">rtl</xsl:attribute>
>+ </xsl:when>
>+ <xsl:otherwise>
>+ <xsl:attribute name="style">display:block; </xsl:attribute>
>+ </xsl:otherwise>
>+ </xsl:choose>
>+ <xsl:if test="boolean($label)">
>+ 
>+ <xsl:value-of select="$label"/>
>+ 
>+ </xsl:if>
>+ <xsl:variable name="str">
>+ <xsl:for-each select="marc:subfield">
>+ <xsl:if test="contains($codes, @code)">
>+ <xsl:value-of select="text()"/>
>+ <xsl:text> </xsl:text>
>+ </xsl:if>
>+ </xsl:for-each>
>+ </xsl:variable>
>+ <xsl:choose>
>+ <xsl:when test="boolean($bibno)">
>+ <a>
>+ <xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$bibno"/></xsl:attribute>
>+ <xsl:value-of select="$str"/>
>+ </a>
>+ </xsl:when>
>+ <xsl:when test="boolean($index) and boolean(marc:subfield[@code=9])">
>+ <a>
>+ <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
>+ <xsl:value-of select="$str"/>
>+ </a>
>+ </xsl:when>
>+ <xsl:when test="boolean($index)">
>+ <a>
>+ <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="$index"/>:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
>+ <xsl:value-of select="$str"/>
>+ </a>
>+ </xsl:when>
>+ <xsl:otherwise>
>+ <xsl:value-of select="$str"/>
>+ </xsl:otherwise>
>+ </xsl:choose>
>+ 
>+ </xsl:if>
>+ </xsl:for-each>
>+
>+ </xsl:template>
>+
>+</xsl:stylesheet>
>+
>+<!-- Stylus Studio meta-information - (c)1998-2002 eXcelon Corp.
> <metaInformation>
> <scenarios/><MapperInfo srcSchemaPath="" srcSchemaRoot="" srcSchemaPathIsRelative="yes" srcSchemaInterpretAsXML="no" destSchemaPath="" destSchemaRoot="" destSchemaPathIsRelative="yes" destSchemaInterpretAsXML="no"/>
> </metaInformation>
>-- 
>1.6.0.4
>

Actions: View | Diff | Splinter Review

Attachments on bug 3567: 1429 | 1430 | 1431 | 1432 | 1433 | 1434