[PATCH 2/2] Fix quoted CSV import

[Miika Turkia]

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 whether there is verifying that 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 at gmail.com>
---
 xslt/manualcsv2xml.xslt | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/xslt/manualcsv2xml.xslt b/xslt/manualcsv2xml.xslt
index 877410b..ef63975 100644
--- a/xslt/manualcsv2xml.xslt
+++ b/xslt/manualcsv2xml.xslt
@@ -392,13 +392,11 @@
         <xsl:choose>
           <xsl:when test="substring($line, 1, 1) = '"'">
             <xsl:choose>
-              <xsl:when test="substring-before($line,'"$fs') != ''">
-                <xsl:value-of select="substring-before($line,'"$fs')"/>
+              <xsl:when test="substring-before(substring-after($line, '"'), '"') != ''">
+                <xsl:value-of select="substring-before(substring-after($line, '"'), '"')"/>
               </xsl:when>
               <xsl:otherwise>
-                <xsl:if test="substring-after(substring-after($line, '"'), '"') = ''">
-                  <xsl:value-of select="concat(substring-after($line, '"'), substring-before($remaining, '"'))"/>
-                </xsl:if>
+                <xsl:value-of select="concat(substring-after($line, '"'), substring-before($remaining, '"'))"/>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>
-- 
1.9.1