Bugzilla – Attachment 20591 Details for
Bug 9820
Missing space between 100/700 $a and $c (MARC21/XSLT)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 9820: display titles in MARC21 name headings better in XSLT mode
PASSED-QA-Bug-9820-display-titles-in-MARC21-name-h.patch (text/plain), 10.86 KB, created by
Katrin Fischer
on 2013-08-25 17:15:28 UTC
(
hide
)
Description:
[PASSED QA] Bug 9820: display titles in MARC21 name headings better in XSLT mode
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-08-25 17:15:28 UTC
Size:
10.86 KB
patch
obsolete
>From fa689280b31b10a03f54b0f590166829501c706a Mon Sep 17 00:00:00 2001 >From: Galen Charlton <gmc@esilibrary.com> >Date: Fri, 15 Mar 2013 14:17:09 -0700 >Subject: [PATCH] [PASSED QA] Bug 9820: display titles in MARC21 name headings > better in XSLT mode > >Prior to this patch, if a 100/700 had a $c, it would be >displayed with no space between the contents of $a and $c in XSLT mode. > >For example, > >100 1#$aSeuss,$cDr. > >would be displayed as > >SeussDr > >The problem was caused by the original version of the stylesheets >drawing a bit too much from the MARC21 to MODS transformation. > >To test: > >[1] In a MARC21 database, turn on XSLT display mode for > staff and OPAC. >[2] Create or identify a bib that has a 100 or 700 field > with both a $a and a $c. >[3] Before applying the patch, verify that the name is > displayed in bib details and search results with the > name and title squashed together. For example, "SeussDr" >[3] After applying the patch, verify that the name displays > in bib details and search results with a space and > intervening punctuation between the name and the title. For > example, "Seuss, Dr." > >Signed-off-by: Galen Charlton <gmc@esilibrary.com> >Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Passes test plan, works nicely. >--- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 18 +++--------------- > .../prog/en/xslt/MARC21slim2intranetResults.xsl | 19 +++---------------- > .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 18 +++--------------- > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 19 +++---------------- > 4 files changed, 12 insertions(+), 62 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index a47e6e8..caa0ab5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -834,18 +834,17 @@ > > </xsl:template> > >- <xsl:template name="nameABCDQ"> >+ <xsl:template name="nameABCQ"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">aq</xsl:with-param> >+ <xsl:with-param name="codes">abcq</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:call-template name="termsOfAddress"/> > </xsl:template> > > <xsl:template name="nameABCDN"> >@@ -874,17 +873,6 @@ > <xsl:with-param name="codes">acdeq</xsl:with-param> > </xsl:call-template> > </xsl:template> >- <xsl:template name="termsOfAddress"> >- <xsl:if test="marc:subfield[@code='b' or @code='c']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">bc</xsl:with-param> >- </xsl:call-template> >- </xsl:with-param> >- </xsl:call-template> >- </xsl:if> >- </xsl:template> > > <xsl:template name="part"> > <xsl:variable name="partNumber"> >@@ -950,7 +938,7 @@ > </xsl:otherwise> > </xsl:choose> > <xsl:choose> >- <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCDQ"/></xsl:when> >+ <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when> > <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when> > <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when> > </xsl:choose> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >index 181761a..cbc505d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >@@ -347,7 +347,7 @@ > <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute> > </xsl:otherwise> > </xsl:choose> >- <xsl:call-template name="nameABCDQ"/></a> >+ <xsl:call-template name="nameABCQ"/></a> > <xsl:choose> > <xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose> > </xsl:for-each> >@@ -867,18 +867,17 @@ > </xsl:if> > </xsl:template> > >- <xsl:template name="nameABCDQ"> >+ <xsl:template name="nameABCQ"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">aq</xsl:with-param> >+ <xsl:with-param name="codes">abcq</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:call-template name="termsOfAddress"/> > </xsl:template> > > <xsl:template name="nameABCDN"> >@@ -903,18 +902,6 @@ > </xsl:call-template> > </xsl:template> > >- <xsl:template name="termsOfAddress"> >- <xsl:if test="marc:subfield[@code='b' or @code='c']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">bc</xsl:with-param> >- </xsl:call-template> >- </xsl:with-param> >- </xsl:call-template> >- </xsl:if> >- </xsl:template> >- > <xsl:template name="nameDate"> > <xsl:for-each select="marc:subfield[@code='d']"> > <xsl:call-template name="chopPunctuation"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >index ad74c53..fd0eb68 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >@@ -966,7 +966,7 @@ > </xsl:otherwise> > </xsl:choose> > <xsl:choose> >- <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCDQ"/></xsl:when> >+ <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when> > <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when> > <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when> > </xsl:choose> >@@ -992,18 +992,17 @@ > <xsl:text>.</xsl:text> > </xsl:template> > >- <xsl:template name="nameABCDQ"> >+ <xsl:template name="nameABCQ"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">aq</xsl:with-param> >+ <xsl:with-param name="codes">abcq</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:call-template name="termsOfAddress"/> > </xsl:template> > > <xsl:template name="nameABCDN"> >@@ -1032,17 +1031,6 @@ > <xsl:with-param name="codes">acdeq</xsl:with-param> > </xsl:call-template> > </xsl:template> >- <xsl:template name="termsOfAddress"> >- <xsl:if test="marc:subfield[@code='b' or @code='c']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">bc</xsl:with-param> >- </xsl:call-template> >- </xsl:with-param> >- </xsl:call-template> >- </xsl:if> >- </xsl:template> > > <xsl:template name="part"> > <xsl:variable name="partNumber"> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index 20fdabf..462c250 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -455,7 +455,7 @@ > <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700) and @ind1!='z']"> > <xsl:choose> > <xsl:when test="position()=last()"> >- <xsl:call-template name="nameABCDQ"/>. >+ <xsl:call-template name="nameABCQ"/>. > </xsl:when> > <xsl:otherwise> > <xsl:call-template name="nameABCDQ"/>; >@@ -1180,18 +1180,17 @@ > </xsl:choose> > </xsl:template> > >- <xsl:template name="nameABCDQ"> >+ <xsl:template name="nameABCQ"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">aq</xsl:with-param> >+ <xsl:with-param name="codes">abcq</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:call-template name="termsOfAddress"/> > </xsl:template> > > <xsl:template name="nameABCDN"> >@@ -1216,18 +1215,6 @@ > </xsl:call-template> > </xsl:template> > >- <xsl:template name="termsOfAddress"> >- <xsl:if test="marc:subfield[@code='b' or @code='c']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">bc</xsl:with-param> >- </xsl:call-template> >- </xsl:with-param> >- </xsl:call-template> >- </xsl:if> >- </xsl:template> >- > <xsl:template name="nameDate"> > <xsl:for-each select="marc:subfield[@code='d']"> > <xsl:call-template name="chopPunctuation"> >-- >1.7.9.5
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 9820
:
16172
|
16822
|
20117
|
20118
| 20591 |
20592