diff options
| -rw-r--r-- | xslt/csv2xml.xslt | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/xslt/csv2xml.xslt b/xslt/csv2xml.xslt index 87d494f30..5c524f668 100644 --- a/xslt/csv2xml.xslt +++ b/xslt/csv2xml.xslt @@ -34,7 +34,7 @@ <xsl:attribute name="time"> <xsl:value-of select="concat(substring($time, 2, 2), ':', substring($time, 4, 2))"/> </xsl:attribute> - <divecomputerid deviceid="ffffffff" model="stone" /> + <divecomputerid deviceid="ffffffff" model="csv" /> <xsl:call-template name="printLine"> <xsl:with-param name="line" select="substring-before(//csv, $lf)"/> <xsl:with-param name="remaining" select="substring-after(//csv, $lf)"/> @@ -48,10 +48,27 @@ <xsl:param name="line"/> <xsl:param name="remaining"/> - <xsl:if test="substring-before($line, $fs) != substring-before(substring-before($remaining, $lf), $fs)"> - <xsl:call-template name="printFields"> - <xsl:with-param name="line" select="$line"/> - </xsl:call-template> + <!-- We only want to process lines with different time stamps, and + timeField is not necessarily the first field --> + <xsl:if test="$line != substring-before($remaining, $lf)"> + <xsl:variable name="curTime"> + <xsl:call-template name="getFieldByIndex"> + <xsl:with-param name="index" select="$timeField"/> + <xsl:with-param name="line" select="$line"/> + </xsl:call-template> + </xsl:variable> + <xsl:variable name="prevTime"> + <xsl:call-template name="getFieldByIndex"> + <xsl:with-param name="index" select="$timeField"/> + <xsl:with-param name="line" select="substring-before($remaining, $lf)"/> + </xsl:call-template> + </xsl:variable> + + <xsl:if test="$curTime != $prevTime"> + <xsl:call-template name="printFields"> + <xsl:with-param name="line" select="$line"/> + </xsl:call-template> + </xsl:if> </xsl:if> <xsl:if test="$remaining != ''"> <xsl:call-template name="printLine"> |