diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2015-01-23 06:35:45 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-01-23 17:43:08 +1200 |
| commit | 54aa6dd91fad7c8ac4ac94f19e09f7a234096904 (patch) | |
| tree | a69e4abee161810751e40321f01541b3af6b796e | |
| parent | c5075b93a212645a71f5ebeaba997b4b0aae978d (diff) | |
| download | subsurface-54aa6dd91fad7c8ac4ac94f19e09f7a234096904.tar.gz | |
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>
| -rw-r--r-- | xslt/manualcsv2xml.xslt | 8 |
1 files 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) = '"'"> <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> |