From dd3261f2323c130fc2ffbe0af69e0100581bec0c Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Wed, 15 Jan 2014 21:17:29 +0200
Subject: Grab also the last column in CSV when requested

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

(limited to 'xslt')

diff --git a/xslt/csv2xml.xslt b/xslt/csv2xml.xslt
index 5c524f668..eb4c8761e 100644
--- a/xslt/csv2xml.xslt
+++ b/xslt/csv2xml.xslt
@@ -88,9 +88,6 @@
       </xsl:call-template>
     </xsl:variable>
 
-    <!-- First field should be dive time. If the value is not numeric,
-         we'll skip it. (We do also allow time in h:m:s notation.) -->
-
     <xsl:if test="number($value) = $value or number(substring-before($value, ':')) = substring-before($value, ':')">
       <sample>
         <xsl:attribute name="time">
@@ -192,7 +189,14 @@
         </xsl:call-template>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:value-of select="substring-before($line,$fs)"/>
+        <xsl:choose>
+          <xsl:when test="substring-before($line,$fs) != ''">
+            <xsl:value-of select="substring-before($line,$fs)"/>
+          </xsl:when>
+          <xsl:otherwise>
+            <xsl:value-of select="$line"/>
+          </xsl:otherwise>
+        </xsl:choose>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:template>
-- 
cgit v1.2.3-70-g09d2