Add setpoint support on CSV import (XSLT parsing)

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2015-07-21 16:37:41 +03:00 committed by Dirk Hohndel
parent 19b54dc9ef
commit 2fc54b6855

View file

@ -15,6 +15,7 @@
<xsl:param name="ttsField" select="ttsField"/> <xsl:param name="ttsField" select="ttsField"/>
<xsl:param name="stopdepthField" select="stopdepthField"/> <xsl:param name="stopdepthField" select="stopdepthField"/>
<xsl:param name="pressureField" select="pressureField"/> <xsl:param name="pressureField" select="pressureField"/>
<xsl:param name="setpointField" select="setpointField"/>
<xsl:param name="date" select="date"/> <xsl:param name="date" select="date"/>
<xsl:param name="time" select="time"/> <xsl:param name="time" select="time"/>
<xsl:param name="units" select="units"/> <xsl:param name="units" select="units"/>
@ -43,7 +44,7 @@
<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>
<divecomputer model="Imported from CSV" deviceid="ffffffff"> <divecomputer model="Imported from CSV" deviceid="ffffffff">
<xsl:if test="$po2Field >= 0 or $o2sensor1Field >= 0 or $o2sensor2Field >= 0 or $o2sensor3Field >= 0"> <xsl:if test="$po2Field >= 0 or $setpointField >= 0 or $o2sensor1Field >= 0 or $o2sensor2Field >= 0 or $o2sensor3Field >= 0">
<xsl:attribute name="dctype">CCR</xsl:attribute> <xsl:attribute name="dctype">CCR</xsl:attribute>
<xsl:attribute name="no_o2sensors"> <xsl:attribute name="no_o2sensors">
<xsl:copy-of select="number($o2sensor1Field >= 0) + number($o2sensor2Field >= 0) + number($o2sensor3Field >= 0)" /> <xsl:copy-of select="number($o2sensor1Field >= 0) + number($o2sensor2Field >= 0) + number($o2sensor3Field >= 0)" />
@ -200,6 +201,16 @@
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
<xsl:choose>
<xsl:when test="$setpointField >= 0">
<xsl:attribute name="po2">
<xsl:call-template name="getFieldByIndex">
<xsl:with-param name="index" select="$setpointField"/>
<xsl:with-param name="line" select="$line"/>
</xsl:call-template>
</xsl:attribute>
</xsl:when>
<xsl:otherwise>
<xsl:if test="$po2Field >= 0"> <xsl:if test="$po2Field >= 0">
<xsl:attribute name="po2"> <xsl:attribute name="po2">
<xsl:call-template name="getFieldByIndex"> <xsl:call-template name="getFieldByIndex">
@ -208,6 +219,8 @@
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
</xsl:if> </xsl:if>
</xsl:otherwise>
</xsl:choose>
<xsl:if test="$o2sensor1Field >= 0"> <xsl:if test="$o2sensor1Field >= 0">
<xsl:attribute name="sensor1"> <xsl:attribute name="sensor1">