Attachment 110220 Details for Bug 15437 – Bug 15437: (follow-up) Move $i subfield display to the beginning and add OPAC

[patch] Bug 15437: (follow-up) Move $i subfield display to the beginning and add OPAC

Bug-15437-follow-up-Move-i-subfield-display-to-the.patch (text/plain), 26.68 KB, created by Martin Renvoize (ashimema) on 2020-09-16 15:22:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-16 15:22:11 UTC

Size: 26.68 KB

patch

obsolete

>From 780c01511e52bb28ec0426ee8a23b6d36abc8e5c Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sun, 13 Sep 2020 15:06:46 +0000
>Subject: [PATCH] Bug 15437: (follow-up) Move $i subfield display to the
> beginning and add OPAC
>
>This patch builds on Caitlin's to finish the work but keeping as
>much from her code as possible.
>
>- Finishes reindenting started in first patch
>- Readds a space after the label
>- Moves $i to the beginning of the field as suggested by MARC21
> documentation:
> http://www.loc.gov/marc/bibliographic/bd76x78x.html
> The data in subfield $i can be displayed preceding the other
> data contained in the field.
>- Adds a span with a class around the $i so people can control
> the formatting
>
>To test:
> - Catalog a record with 780/785 with and without $i.
> - Verify that they display nicely in staff and OPAC, $i should show.
> Also $a and $t will show (unchanged by this patch)
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../en/xslt/MARC21slim2intranetDetail.xsl | 229 +++++++++--------
> .../en/xslt/MARC21slim2OPACDetail.xsl | 234 ++++++++++--------
> 2 files changed, 244 insertions(+), 219 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>index 115901f278..b1bef27766 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>@@ -1242,125 +1242,134 @@
> 
> 
> <xsl:if test="marc:datafield[@tag=780]">
>- <xsl:for-each select="marc:datafield[@tag=780]">
>- <xsl:if test="@ind1=0">
>- 
>- <xsl:choose>
>- <xsl:when test="@ind2=0">
>- Continues:
>- </xsl:when>
>- <xsl:when test="@ind2=1">
>- Continues in part:
>- </xsl:when>
>- <xsl:when test="@ind2=2">
>- Supersedes:
>- </xsl:when>
>- <xsl:when test="@ind2=3">
>- Supersedes in part:
>- </xsl:when>
>- <xsl:when test="@ind2=4">
>- Formed by the union: ... and: ...
>- </xsl:when>
>- <xsl:when test="@ind2=5">
>- Absorbed:
>- </xsl:when>
>- <xsl:when test="@ind2=6">
>- Absorbed in part:
>- </xsl:when>
>- <xsl:when test="@ind2=7">
>- Separated from:
>- </xsl:when>
>- </xsl:choose>
>- <xsl:variable name="f780">
>- <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="$f780"/>
>- </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($f780, '()', ''), true())"/></xsl:attribute>
>- <xsl:value-of select="$f780"/>
>- </a>
>- </xsl:otherwise>
>- </xsl:choose>
>- 
>- 
>- <xsl:if test="marc:subfield[@code='i']">
>- <xsl:value-of select="marc:subfield[@code='i']"/>
>- </xsl:if>
>+ <xsl:for-each select="marc:datafield[@tag=780]">
>+ <xsl:if test="@ind1=0">
>+ 
>+ <xsl:choose>
>+ <xsl:when test="@ind2=0">
>+ Continues:
>+ </xsl:when>
>+ <xsl:when test="@ind2=1">
>+ Continues in part:
>+ </xsl:when>
>+ <xsl:when test="@ind2=2">
>+ Supersedes:
>+ </xsl:when>
>+ <xsl:when test="@ind2=3">
>+ Supersedes in part:
>+ </xsl:when>
>+ <xsl:when test="@ind2=4">
>+ Formed by the union: ... and: ...
>+ </xsl:when>
>+ <xsl:when test="@ind2=5">
>+ Absorbed:
>+ </xsl:when>
>+ <xsl:when test="@ind2=6">
>+ Absorbed in part:
>+ </xsl:when>
>+ <xsl:when test="@ind2=7">
>+ Separated from:
>+ </xsl:when>
>+ </xsl:choose>
>+ <xsl:text> </xsl:text>
> 
>- <xsl:if test="marc:subfield[@code='n']">
>- <xsl:value-of select="marc:subfield[@code='n']"/>
>- </xsl:if>
>+ <xsl:if test="marc:subfield[@code='i']">
>+ 
>+ <xsl:value-of select="marc:subfield[@code='i']"/>
>+ <xsl:text> </xsl:text>
>+ 
>+ </xsl:if>
> 
>- </xsl:if>
>- </xsl:for-each>
>+ <xsl:variable name="f780">
>+ <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="$f780"/>
>+ </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($f780, '()', ''), true())"/></xsl:attribute>
>+ <xsl:value-of select="$f780"/>
>+ </a>
>+ </xsl:otherwise>
>+ </xsl:choose>
>+ 
>+
>+ <xsl:if test="marc:subfield[@code='n']">
>+ <xsl:value-of select="marc:subfield[@code='n']"/>
>+ </xsl:if>
>+
>+ </xsl:if>
>+ </xsl:for-each>
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=785]">
>- <xsl:for-each select="marc:datafield[@tag=785]">
>- 
>- <xsl:choose>
>- <xsl:when test="@ind2=0">
>- Continued by:
>- </xsl:when>
>- <xsl:when test="@ind2=1">
>- Continued in part by:
>- </xsl:when>
>- <xsl:when test="@ind2=2">
>- Superseded by:
>- </xsl:when>
>- <xsl:when test="@ind2=3">
>- Superseded in part by:
>- </xsl:when>
>- <xsl:when test="@ind2=4">
>- Absorbed by:
>- </xsl:when>
>- <xsl:when test="@ind2=5">
>- Absorbed in part by:
>- </xsl:when>
>- <xsl:when test="@ind2=6">
>- Split into .. and ...:
>- </xsl:when>
>- <xsl:when test="@ind2=7">
>- Merged with ... to form ...
>- </xsl:when>
>- <xsl:when test="@ind2=8">
>- Changed back to:
>- </xsl:when>
>- </xsl:choose>
>- <xsl:text> </xsl:text>
>- <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:for-each select="marc:datafield[@tag=785]">
>+ 
>+ <xsl:choose>
>+ <xsl:when test="@ind2=0">
>+ Continued by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=1">
>+ Continued in part by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=2">
>+ Superseded by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=3">
>+ Superseded in part by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=4">
>+ Absorbed by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=5">
>+ Absorbed in part by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=6">
>+ Split into .. and ...:
>+ </xsl:when>
>+ <xsl:when test="@ind2=7">
>+ Merged with ... to form ...
>+ </xsl:when>
>+ <xsl:when test="@ind2=8">
>+ Changed back to:
>+ </xsl:when>
>+ </xsl:choose>
>+ <xsl:text> </xsl:text>
> 
>- <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:if test="marc:subfield[@code='i']">
>+ 
>+ <xsl:value-of select="marc:subfield[@code='i']"/>
>+ <xsl:text> </xsl:text>
>+ 
>+ </xsl:if>
> 
>- 
>- <xsl:if test="marc:subfield[@code='i']">
>- <xsl:value-of select="marc:subfield[@code='i']"/>
>- </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:for-each>
>+ <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:for-each>
> </xsl:if>
> 
> <xsl:if test="$OPACBaseURL!=''">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>index f507ea428e..d4096d666c 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>@@ -1353,125 +1353,141 @@
> 
> 
> <xsl:if test="marc:datafield[@tag=780]">
>- <xsl:for-each select="marc:datafield[@tag=780]">
>- <xsl:if test="@ind1=0">
>- 
>- <xsl:choose>
>- <xsl:when test="@ind2=0">
>- Continues:
>- </xsl:when>
>- <xsl:when test="@ind2=1">
>- Continues in part:
>- </xsl:when>
>- <xsl:when test="@ind2=2">
>- Supersedes:
>- </xsl:when>
>- <xsl:when test="@ind2=3">
>- Supersedes in part:
>- </xsl:when>
>- <xsl:when test="@ind2=4">
>- Formed by the union: ... and: ...
>- </xsl:when>
>- <xsl:when test="@ind2=5">
>- Absorbed:
>- </xsl:when>
>- <xsl:when test="@ind2=6">
>- Absorbed in part:
>- </xsl:when>
>- <xsl:when test="@ind2=7">
>- Separated from:
>- </xsl:when>
>- </xsl:choose>
>- <xsl:text> </xsl:text>
>- <xsl:variable name="f780">
>- <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/opac-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="$f780"/>
>- </a>
>- </xsl:when>
>- <xsl:otherwise>
>- <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
>- <xsl:value-of select="$f780"/>
>- </a>
>- </xsl:otherwise>
>- </xsl:choose>
>- 
>+ <xsl:for-each select="marc:datafield[@tag=780]">
>+ <xsl:if test="@ind1=0">
>+ 
>+ <xsl:choose>
>+ <xsl:when test="@ind2=0">
>+ Continues:
>+ </xsl:when>
>+ <xsl:when test="@ind2=1">
>+ Continues in part:
>+ </xsl:when>
>+ <xsl:when test="@ind2=2">
>+ Supersedes:
>+ </xsl:when>
>+ <xsl:when test="@ind2=3">
>+ Supersedes in part:
>+ </xsl:when>
>+ <xsl:when test="@ind2=4">
>+ Formed by the union: ... and: ...
>+ </xsl:when>
>+ <xsl:when test="@ind2=5">
>+ Absorbed:
>+ </xsl:when>
>+ <xsl:when test="@ind2=6">
>+ Absorbed in part:
>+ </xsl:when>
>+ <xsl:when test="@ind2=7">
>+ Separated from:
>+ </xsl:when>
>+ </xsl:choose>
>+ <xsl:text> </xsl:text>
> 
>- <xsl:if test="marc:subfield[@code='n']">
>- <xsl:value-of select="marc:subfield[@code='n']"/>
>- </xsl:if>
>+ <xsl:if test="marc:subfield[@code='i']">
>+ 
>+ <xsl:value-of select="marc:subfield[@code='i']"/>
>+ <xsl:text> </xsl:text>
>+ 
>+ </xsl:if>
> 
>- </xsl:if>
>- </xsl:for-each>
>+ <xsl:variable name="f780">
>+ <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/opac-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="$f780"/>
>+ </a>
>+ </xsl:when>
>+ <xsl:otherwise>
>+ <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
>+ <xsl:value-of select="$f780"/>
>+ </a>
>+ </xsl:otherwise>
>+ </xsl:choose>
>+ 
>+
>+ <xsl:if test="marc:subfield[@code='n']">
>+ <xsl:value-of select="marc:subfield[@code='n']"/>
>+ </xsl:if>
>+
>+ </xsl:if>
>+ </xsl:for-each>
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=785]">
>- <xsl:for-each select="marc:datafield[@tag=785]">
>- <xsl:if test="@ind1=0">
>- 
>- <xsl:choose>
>- <xsl:when test="@ind2=0">
>- Continued by:
>- </xsl:when>
>- <xsl:when test="@ind2=1">
>- Continued in part by:
>- </xsl:when>
>- <xsl:when test="@ind2=2">
>- Superseded by:
>- </xsl:when>
>- <xsl:when test="@ind2=3">
>- Superseded in part by:
>- </xsl:when>
>- <xsl:when test="@ind2=4">
>- Absorbed by:
>- </xsl:when>
>- <xsl:when test="@ind2=5">
>- Absorbed in part by:
>- </xsl:when>
>- <xsl:when test="@ind2=6">
>- Split into .. and ...:
>- </xsl:when>
>- <xsl:when test="@ind2=7">
>- Merged with ... to form ...
>- </xsl:when>
>- <xsl:when test="@ind2=8">
>- Changed back to:
>- </xsl:when>
>- </xsl:choose>
>- <xsl:text> </xsl:text>
>- <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:for-each select="marc:datafield[@tag=785]">
>+ <xsl:if test="@ind1=0">
>+ 
>+ <xsl:choose>
>+ <xsl:when test="@ind2=0">
>+ Continued by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=1">
>+ Continued in part by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=2">
>+ Superseded by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=3">
>+ Superseded in part by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=4">
>+ Absorbed by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=5">
>+ Absorbed in part by:
>+ </xsl:when>
>+ <xsl:when test="@ind2=6">
>+ Split into .. and ...:
>+ </xsl:when>
>+ <xsl:when test="@ind2=7">
>+ Merged with ... to form ...
>+ </xsl:when>
>+ <xsl:when test="@ind2=8">
>+ Changed back to:
>+ </xsl:when>
>+ </xsl:choose>
>+ <xsl:text> </xsl:text>
> 
>- <xsl:choose>
>- <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
>- <a><xsl:attribute name="href">/cgi-bin/koha/opac-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/opac-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:if test="marc:subfield[@code='i']">
>+ 
>+ <xsl:value-of select="marc:subfield[@code='i']"/>
>+ <xsl:text> </xsl:text>
>+ 
>+ </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:if test="marc:subfield[@code='n']">
>- <xsl:value-of select="marc:subfield[@code='n']"/>
>- </xsl:if>
>+ <xsl:choose>
>+ <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
>+ <a><xsl:attribute name="href">/cgi-bin/koha/opac-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/opac-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:if>
>- </xsl:for-each>
>+ <xsl:if test="marc:subfield[@code='n']">
>+ <xsl:value-of select="marc:subfield[@code='n']"/>
>+ </xsl:if>
>+
>+ </xsl:if>
>+ </xsl:for-each>
> </xsl:if>
> 
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 15437: 46842 | 59180 | 110021 | 110022 | 110023 | 110024 | 110219 | 110220