mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
Use timeField variable on CSV import
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:
parent
33391a77e9
commit
bdecafc86a
1 changed files with 22 additions and 5 deletions
|
@ -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">
|
||||
|
|
Loading…
Reference in a new issue