From 11adda45dbedfc41e8d10ede506358378d2490c6 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 12 Sep 2011 11:09:18 +0200
Subject: [PATCH] Trim whitespace and comma for ,-list for field 600

Fixes bug #4594.
---
 etc/tmarc.xsl |   14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

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>
 
-- 
1.7.10.4