From 54aa6dd91fad7c8ac4ac94f19e09f7a234096904 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Fri, 23 Jan 2015 06:35:45 +0200
Subject: Fix quoted CSV import

I am a bit baffled as to how this used to work before and does not work
anymore. Anyway, it should be sufficient that we take the quoted text
without verifying that the next character is the field separator. (Of
course it would be better to make sure field separator follows, as then
quotation marks could be used in the free-form texts.)

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/manualcsv2xml.xslt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/xslt/manualcsv2xml.xslt b/xslt/manualcsv2xml.xslt
index 877410ba7..ef6397580 100644
--- a/xslt/manualcsv2xml.xslt
+++ b/xslt/manualcsv2xml.xslt
@@ -392,13 +392,11 @@
         <xsl:choose>
           <xsl:when test="substring($line, 1, 1) = '&quot;'">
             <xsl:choose>
-              <xsl:when test="substring-before($line,'&quot;$fs') != ''">
-                <xsl:value-of select="substring-before($line,'&quot;$fs')"/>
+              <xsl:when test="substring-before(substring-after($line, '&quot;'), '&quot;') != ''">
+                <xsl:value-of select="substring-before(substring-after($line, '&quot;'), '&quot;')"/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:if test="substring-after(substring-after($line, '&quot;'), '&quot;') = ''">
-                  <xsl:value-of select="concat(substring-after($line, '&quot;'), substring-before($remaining, '&quot;'))"/>
-                </xsl:if>
+                <xsl:value-of select="concat(substring-after($line, '&quot;'), substring-before($remaining, '&quot;'))"/>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>
-- 
cgit v1.2.3-70-g09d2