Bugzilla – Attachment 9133 Details for
Bug 7845
Multiple 260s don't display properly in search results
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 7845: Multiple 260s don't display properly in search results
Bug-7845-Multiple-260s-dont-display-properly-in-se.patch (text/plain), 8.39 KB, created by
Chris Cormack
on 2012-04-12 08:02:12 UTC
(
hide
)
Description:
Bug 7845: Multiple 260s don't display properly in search results
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2012-04-12 08:02:12 UTC
Size:
8.39 KB
patch
obsolete
>From 941ab2a9ebeeff28fc3dead35a22f2834bbfaa86 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Mon, 9 Apr 2012 17:44:38 +0200 >Subject: [PATCH] Bug 7845: Multiple 260s don't display properly in search > results > >Corrects display for multiple 260 fields in intranet and OPAC. >In intranet the order of fields was wrong on the detail page. >In OPAC and intranet punctuation for multiple 260 fields in the >result list was not displaying properly. > >Example after correction: >Publisher: Jena : Elsevier, 1907 ; Stuttgart : Franckh, 1907-1992 ; Jena : Urban & Fischer, 1993-2003 > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >--- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 12 +++++++-- > .../prog/en/xslt/MARC21slim2intranetResults.xsl | 24 +++++++++++++++--- > .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 5 ++- > .../prog/en/xslt/MARC21slim2OPACResults.xsl | 26 ++++++++++++++++---- > 4 files changed, 53 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index a1dca4f..80dbe03 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -296,10 +296,16 @@ > <xsl:with-param name="label">Publisher: </xsl:with-param> > </xsl:call-template> > </xsl:if> >- >+ > <xsl:if test="marc:datafield[@tag=260]"> > <span class="results_summary publisher"><span class="label">Publisher: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> >+ <xsl:if test="marc:subfield[@code='a']"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">a</xsl:with-param> >+ </xsl:call-template> >+ </xsl:if> >+ <xsl:text> </xsl:text> > <xsl:if test="marc:subfield[@code='b']"> > <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}"> > <xsl:call-template name="subfieldSelect"> >@@ -311,11 +317,11 @@ > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">acg</xsl:with-param> >+ <xsl:with-param name="codes">cg</xsl:with-param> > </xsl:call-template> > </xsl:with-param> > </xsl:call-template> >- <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose> >+ <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> > </span> > </xsl:if> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >index 87aebec..6bb1c10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl >@@ -769,14 +769,30 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=260]"> >- <span class="results_summary"> >- <span class="label">Publisher: </span> >+ <span class="results_summary publisher"><span class="label">Publisher: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> >+ <xsl:if test="marc:subfield[@code='a']"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">abcg</xsl:with-param> >+ <xsl:with-param name="codes">a</xsl:with-param> > </xsl:call-template> >+ </xsl:if> >+ <xsl:text> </xsl:text> >+ <xsl:if test="marc:subfield[@code='b']"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">b</xsl:with-param> >+ </xsl:call-template> >+ </xsl:if> >+ <xsl:text> </xsl:text> >+ <xsl:call-template name="chopPunctuation"> >+ <xsl:with-param name="chopString"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">cg</xsl:with-param> >+ </xsl:call-template> >+ </xsl:with-param> >+ </xsl:call-template> >+ <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> >- </span> >+ </span> > </xsl:if> > > <!-- Other Title Statement: Alternate Graphic Representation (MARC 880) --> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >index 189bffe..f507e11 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl >@@ -310,8 +310,9 @@ > <xsl:if test="marc:subfield[@code='a']"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">a</xsl:with-param> >- </xsl:call-template> >+ </xsl:call-template> > </xsl:if> >+ <xsl:text> </xsl:text> > <xsl:if test="marc:subfield[@code='b']"> > <a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}"> > <xsl:call-template name="subfieldSelect"> >@@ -327,7 +328,7 @@ > </xsl:call-template> > </xsl:with-param> > </xsl:call-template> >- <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose> >+ <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> > </span> > </xsl:if> >diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >index d742a29..68a6a1b 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl >@@ -871,16 +871,32 @@ > <xsl:with-param name="label">Publisher: </xsl:with-param> > </xsl:call-template> > </xsl:if> >- >+ > <xsl:if test="marc:datafield[@tag=260]"> >- <span class="results_summary"> >- <span class="label">Publisher: </span> >+ <span class="results_summary publisher"><span class="label">Publisher: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> >+ <xsl:if test="marc:subfield[@code='a']"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">a</xsl:with-param> >+ </xsl:call-template> >+ </xsl:if> >+ <xsl:text> </xsl:text> >+ <xsl:if test="marc:subfield[@code='b']"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">abcg</xsl:with-param> >+ <xsl:with-param name="codes">b</xsl:with-param> > </xsl:call-template> >+ </xsl:if> >+ <xsl:text> </xsl:text> >+ <xsl:call-template name="chopPunctuation"> >+ <xsl:with-param name="chopString"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">cg</xsl:with-param> >+ </xsl:call-template> >+ </xsl:with-param> >+ </xsl:call-template> >+ <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> >- </span> >+ </span> > </xsl:if> > > <!-- Other Title Statement: Alternate Graphic Representation (MARC 880) --> >-- >1.7.5.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 7845
:
9044
| 9133