From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 12 Sep 2011 09:09:18 +0000 (+0200)
Subject: Trim whitespace and comma for ,-list for field 600
X-Git-Tag: v1.6.0~5
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=11adda45dbedfc41e8d10ede506358378d2490c6;p=pazpar2-moved-to-github.git

Trim whitespace and comma for ,-list for field 600

Fixes bug #4594.
---

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index 8380f3d..ff2af3e 100644
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -412,8 +412,18 @@
             <xsl:if test="position() > 1">
               <xsl:text>, </xsl:text>
             </xsl:if>
-            <xsl:value-of select="." />
-          </xsl:for-each>
+	    <xsl:variable name='value'>
+	      <xsl:value-of select='normalize-space(.)'/>
+	    </xsl:variable>
+	    <xsl:choose>
+	      <xsl:when test="substring($value,string-length($value)) = ','">
+		<xsl:value-of select="substring($value,0,string-length($value)-1)"/>
+	      </xsl:when>
+	      <xsl:otherwise>
+		<xsl:value-of select="$value"/>
+	      </xsl:otherwise>
+	    </xsl:choose> 
+         </xsl:for-each>
         </pz:metadata>
       </xsl:for-each>