mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use timeField variable on CSV import

Browse source 
We want to skip duplicate lines on CSV import. For this we need to use
time field, that is not necessarily the first field of the input. This
patch uses the configured time field instead of first one.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2014-01-15 18:47:22 +02:00 • committed by Dirk Hohndel
parent 33391a77e9
commit bdecafc86a
1 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
xslt/csv2xml.xslt
View file

@ -34,7 +34,7 @@
<xsl:attribute name="time"> <xsl:attribute name="time">
<xsl:value-of select="concat(substring($time, 2, 2), ':', substring($time, 4, 2))"/> <xsl:value-of select="concat(substring($time, 2, 2), ':', substring($time, 4, 2))"/>
</xsl:attribute> </xsl:attribute>
<divecomputerid deviceid="ffffffff" model="stone" /> <divecomputerid deviceid="ffffffff" model="csv" />
<xsl:call-template name="printLine"> <xsl:call-template name="printLine">
<xsl:with-param name="line" select="substring-before(//csv, $lf)"/> <xsl:with-param name="line" select="substring-before(//csv, $lf)"/>
<xsl:with-param name="remaining" select="substring-after(//csv, $lf)"/> <xsl:with-param name="remaining" select="substring-after(//csv, $lf)"/>
@ -48,10 +48,27 @@
<xsl:param name="line"/> <xsl:param name="line"/>
<xsl:param name="remaining"/> <xsl:param name="remaining"/>
<xsl:if test="substring-before($line, $fs) != substring-before(substring-before($remaining, $lf), $fs)"> <!-- We only want to process lines with different time stamps, and
<xsl:call-template name="printFields"> timeField is not necessarily the first field -->
<xsl:with-param name="line" select="$line"/> <xsl:if test="$line != substring-before($remaining, $lf)">
</xsl:call-template> <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>
<xsl:if test="$remaining != ''"> <xsl:if test="$remaining != ''">
<xsl:call-template name="printLine"> <xsl:call-template name="printLine">