Bugzilla – Attachment 21941 Details for
Bug 10957
710$a with 710$b (subordinate unit) present shows wrong (XSLT)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
710$a with 710$b (subordinate unit) present shows wrong (XSLT)
0001-Bug-10957-710-a-with-710-b-subordinate-unit-present-.patch (text/plain), 7.71 KB, created by
Paola Rossi
on 2013-10-10 10:33:00 UTC
(
hide
)
Description:
710$a with 710$b (subordinate unit) present shows wrong (XSLT)
Filename:
MIME Type:
Creator:
Paola Rossi
Created:
2013-10-10 10:33:00 UTC
Size:
7.71 KB
patch
obsolete
>From f11037a665286761e82292fa68989363bed8df64 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@gmail.com> >Date: Thu, 26 Sep 2013 15:12:51 -0300 >Subject: [PATCH] Bug 10957: 710$a with 710$b (subordinate unit) present shows > wrong (XSLT) > >This patch fixes a visualization problem with XSLTs for 710$a and 710$b in both >Intranet and OPAC interfaces, on both search results and detail pages. > >To test: >- Create two bibliographic records. > a) One with only 710$a > b) One with 710$a and 710$b >- Do a search on OPAC and Intranet and see 710$a and 710$b are put together without a space in the middle. >- Enter the detail page (in both interfaces) and see the problem is present there too. >- Apply the patch >- It should look as expeced. > >Regards >To+ > >Sponsored-by: Universidad Nacional de Cordoba > >Signed-off-by: Paola Rossi <paola.rossi@cineca.it> >--- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 19 ++++++----- > .../prog/en/xslt/MARC21slim2intranetResults.xsl | 18 +++++++++-- > .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 19 ++++++----- > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 33 +++++++++++--------- > 4 files changed, 56 insertions(+), 33 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index 14ff809..9fb1c04 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -853,14 +853,17 @@ > <xsl:with-param name="chopString" select="."/> > </xsl:call-template> > </xsl:for-each> >- <xsl:for-each select="marc:subfield[@code='b']"> >- <xsl:value-of select="."/> >- <xsl:choose> >- <xsl:when test="position() != last()"> >- <xsl:text> -- </xsl:text> >- </xsl:when> >- </xsl:choose> >- </xsl:for-each> >+ <xsl:if test="marc:subfield[@code='b']"> >+ <xsl:text>. </xsl:text> >+ <xsl:for-each select="marc:subfield[@code='b']"> >+ <xsl:value-of select="."/> >+ <xsl:choose> >+ <xsl:when test="position() != last()"> >+ <xsl:text> -- </xsl:text> >+ </xsl:when> >+ </xsl:choose> >+ </xsl:for-each> >+ </xsl:if> > <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">cdn</xsl:with-param> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >index cbc505d..ed5d796 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >@@ -886,10 +886,22 @@ > <xsl:with-param name="chopString" select="."/> > </xsl:call-template> > </xsl:for-each> >- <xsl:for-each select="marc:subfield[@code='b']"> >+ >+ <xsl:if test="marc:subfield[@code='b']"> >+ <xsl:text>. </xsl:text> >+ <xsl:for-each select="marc:subfield[@code='b']"> > <xsl:value-of select="."/> >- </xsl:for-each> >- <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']"> >+ <xsl:choose> >+ <xsl:when test="position() != last()"> >+ <xsl:text> -- </xsl:text> >+ </xsl:when> >+ </xsl:choose> >+ </xsl:for-each> >+ </xsl:if> >+ >+ <xsl:if test="marc:subfield[@code='c'] or >+ marc:subfield[@code='d'] or >+ marc:subfield[@code='n']"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">cdn</xsl:with-param> > </xsl:call-template> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >index c3a846c..680a5f6 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >@@ -1054,14 +1054,17 @@ > <xsl:with-param name="chopString" select="."/> > </xsl:call-template> > </xsl:for-each> >- <xsl:for-each select="marc:subfield[@code='b']"> >- <xsl:value-of select="."/> >- <xsl:choose> >- <xsl:when test="position() != last()"> >- <xsl:text> -- </xsl:text> >- </xsl:when> >- </xsl:choose> >- </xsl:for-each> >+ <xsl:if test="marc:subfield[@code='b']"> >+ <xsl:text>. </xsl:text> >+ <xsl:for-each select="marc:subfield[@code='b']"> >+ <xsl:value-of select="."/> >+ <xsl:choose> >+ <xsl:when test="position() != last()"> >+ <xsl:text> -- </xsl:text> >+ </xsl:when> >+ </xsl:choose> >+ </xsl:for-each> >+ </xsl:if> > <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">cdn</xsl:with-param> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index addc7de..2c3e389 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -465,11 +465,6 @@ > > <xsl:for-each select="marc:datafield[(@tag=110 or @tag=710) and @ind1!='z']"> > <xsl:choose> >- <xsl:when test="position()=1"> >- <xsl:text> -- </xsl:text> >- </xsl:when> >- </xsl:choose> >- <xsl:choose> > <xsl:when test="position()=last()"> > <xsl:call-template name="nameABCDN"/> > </xsl:when> >@@ -1195,17 +1190,27 @@ > > <xsl:template name="nameABCDN"> > <xsl:for-each select="marc:subfield[@code='a']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString" select="."/> >- </xsl:call-template> >+ <xsl:call-template name="chopPunctuation"> >+ <xsl:with-param name="chopString" select="."/> >+ </xsl:call-template> > </xsl:for-each> >- <xsl:for-each select="marc:subfield[@code='b']"> >+ <xsl:if test="marc:subfield[@code='b']"> >+ <xsl:text>. </xsl:text> >+ <xsl:for-each select="marc:subfield[@code='b']"> > <xsl:value-of select="."/> >- </xsl:for-each> >- <xsl:if test="marc:subfield[@code='c'] or marc:subfield[@code='d'] or marc:subfield[@code='n']"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">cdn</xsl:with-param> >- </xsl:call-template> >+ <xsl:choose> >+ <xsl:when test="position() != last()"> >+ <xsl:text> -- </xsl:text> >+ </xsl:when> >+ </xsl:choose> >+ </xsl:for-each> >+ </xsl:if> >+ <xsl:if test="marc:subfield[@code='c'] or >+ marc:subfield[@code='d'] or >+ marc:subfield[@code='n']"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">cdn</xsl:with-param> >+ </xsl:call-template> > </xsl:if> > </xsl:template> > >-- >1.7.10.4 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10957
:
21494
|
21501
| 21941