Bugzilla – Attachment 93559 Details for
Bug 22884
Remove ending . from XSLT detail templates
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 22884: Remove field ending . from XSLT templates
Bug-22884-Remove-field-ending--from-XSLT-templates.patch (text/plain), 13.75 KB, created by
Nick Clemens (kidclamp)
on 2019-10-03 11:34:22 UTC
(
hide
)
Description:
Bug 22884: Remove field ending . from XSLT templates
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2019-10-03 11:34:22 UTC
Size:
13.75 KB
patch
obsolete
>From a36b09e4f930048b8cf168c733e3f2bb87a8be27 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Sat, 11 May 2019 22:58:45 +0000 >Subject: [PATCH] Bug 22884: Remove field ending . from XSLT templates > >Currently Koha very inconsistently adds a . at the end when >outputting MARC fields on the detail views. > >This patch removes the few cases where we add in . >Keeping the end user in mind, I believe it's not needed and >the added consistency will be nice. ISBD should be added on >cataloguing or by templates, but we should not mix when possible. > >To test: >Catalog the following fields, if repeatable, add more than one: >- 020 >- 022 >- 111 >- 242 >- 245 >- 246 >- 250 >- 300 >- 440 >- 490 >- 700/710/711 with $i >- 700/710/711 ind.2 = 2 >Verify both on staff and OPAC detail pages that there is no >additional . at the end of the line. > >Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> >Signed-off-by: frederik <frederik@inlibro.com> > >Signed-off-by: Hayley Mapley <hayleymapley@catalyst.net.nz> > >Signed-off-by: Nick Clemens <nick@bywatersolutions.com> >--- > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 18 ++++++------ > .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 9 +----- > .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 34 +++++++--------------- > 3 files changed, 20 insertions(+), 41 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index afa2929f38..80e8edf097 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -207,7 +207,7 @@ > </xsl:call-template> > </a> > <xsl:call-template name="part"/> >- <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> > > <!-- 490 Series not traced, Ind1 = 0 --> >@@ -222,7 +222,7 @@ > </xsl:call-template> > </a> > <xsl:call-template name="part"/> >- <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> > <!-- 490 Series traced, Ind1 = 1 --> > <xsl:if test="marc:datafield[@tag=490][@ind1=1]"> >@@ -439,7 +439,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> >@@ -464,7 +464,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> >@@ -574,7 +574,7 @@ > <xsl:value-of select="concat(' [',marc:subfield[@code='i'],']')"/> > </xsl:if> > <!-- #13386 added separator | --> >- <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose> >+ <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose> > </xsl:for-each> > </span> > </xsl:if> >@@ -589,7 +589,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> >@@ -656,7 +656,7 @@ > </span> > </xsl:if> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> >+ <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> > </xsl:choose> > </xsl:for-each> > </span> >@@ -698,7 +698,7 @@ > </span> > </xsl:if> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> >+ <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> > </xsl:choose> > </xsl:for-each> > </span> >@@ -1597,7 +1597,7 @@ > </xsl:if> > </a> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> >+ <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> > </xsl:choose> > </xsl:for-each> > </h5> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >index 898bd8111d..0e1f4a1e6b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >@@ -339,14 +339,7 @@ > <xsl:for-each select="marc:datafield[@tag=$tag]/marc:subfield[@code=$code]"> > <span><xsl:attribute name="property"><xsl:value-of select="$class"/></xsl:attribute> > <xsl:value-of select="."/> >- <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> > </span> > </xsl:for-each> > </span> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl >index be74affec9..45fcca7f09 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl >@@ -241,7 +241,7 @@ > </xsl:call-template> > </a> > <xsl:call-template name="part"/> >- <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> > <!-- 490 Series traced, Ind1 = 1 --> > <xsl:if test="marc:datafield[@tag=490][@ind1=1]"> >@@ -465,7 +465,7 @@ > </xsl:with-param> > </xsl:call-template> > </span> >- <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> >@@ -492,7 +492,7 @@ > </xsl:with-param> > </xsl:call-template> > </span> >- <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> >@@ -545,14 +545,7 @@ > <xsl:for-each select="marc:datafield[@tag=020]/marc:subfield[@code='a']"> > <span property="isbn"> > <xsl:value-of select="."/> >- <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> > </span> > </xsl:for-each> > </span> >@@ -564,14 +557,7 @@ > <xsl:for-each select="marc:datafield[@tag=022]/marc:subfield[@code='a']"> > <span property="issn"> > <xsl:value-of select="."/> >- <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> > </span> > </xsl:for-each> > </span> >@@ -641,7 +627,7 @@ > </xsl:if> > </span> > <!-- #13386 added separator | --> >- <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose> >+ <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose> > </xsl:for-each> > </span> > </xsl:if> >@@ -659,7 +645,7 @@ > </xsl:with-param> > </xsl:call-template> > </span> >- <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> >@@ -731,7 +717,7 @@ > </span> > </xsl:if> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> >+ <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> > </xsl:choose> > </xsl:for-each> > </span> >@@ -773,7 +759,7 @@ > </span> > </xsl:if> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> >+ <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> > </xsl:choose> > </xsl:for-each> > </span> >@@ -1745,7 +1731,7 @@ > </a> > </xsl:if> > <xsl:choose> >- <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> >+ <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise> > </xsl:choose> > </xsl:for-each> > </h5> >-- >2.11.0
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 22884
:
89624
|
90702
|
90760
|
90761
|
90927
|
90928
|
92143
|
92203
|
92204
|
92205
|
92206
| 93559 |
93560
|
93561