Translate comma to colon on XML import

Translate decimal commas on XML import to decimal points. (As detected
from available sample files using Linus' debug printing.)

Also check for empty values on MacDive temperature import.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Miika Turkia 2013-03-07 21:57:21 +02:00 committed by Dirk Hohndel
parent eee29f2187
commit 9f6b8ca89a
3 changed files with 11 additions and 7 deletions

View file

@ -297,7 +297,7 @@
<weightsystem>
<xsl:attribute name="weight">
<xsl:call-template name="weightConvert">
<xsl:with-param name="weight" select="weight"/>
<xsl:with-param name="weight" select="translate(weight, ',', '.')"/>
<xsl:with-param name="units" select="$units"/>
</xsl:call-template>
</xsl:attribute>
@ -435,10 +435,14 @@
<xsl:choose>
<xsl:when test="$units = 'Imperial'">
<xsl:if test="$temp != ''">
<xsl:value-of select="concat(format-number(($temp - 32) * 5 div 9, '0.0'), ' C')"/>
</xsl:if>
</xsl:when>
<xsl:otherwise>
<xsl:if test="$temp != ''">
<xsl:value-of select="concat($temp, ' C')"/>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
</xsl:template>

View file

@ -33,10 +33,10 @@
<xsl:choose>
<xsl:when test="MEANDEPTH != ''">
<depth max="{concat(MAXDEPTH,' m')}" mean="{concat(MEANDEPTH, ' m')}"/>
<depth max="{concat(translate(MAXDEPTH, ',', '.'),' m')}" mean="{concat(translate(MEANDEPTH, ',', '.'), ' m')}"/>
</xsl:when>
<xsl:otherwise>
<depth max="{concat(MAXDEPTH,' m')}"/>
<depth max="{concat(translate(MAXDEPTH, ',', '.'),' m')}"/>
</xsl:otherwise>
</xsl:choose>
@ -187,7 +187,7 @@
</xsl:call-template>
</xsl:attribute>
<xsl:attribute name="depth">
<xsl:value-of select="concat(DEPTH, ' m')"/>
<xsl:value-of select="concat(translate(DEPTH, ',', '.'), ' m')"/>
</xsl:attribute>
<xsl:attribute name="temp">
<xsl:value-of select="TEMPERATURE"/>

View file

@ -78,7 +78,7 @@
<xsl:value-of select="0" />
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="Equipment/Weight"/>
<xsl:value-of select="translate(Equipment/Weight, ',', '.')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:attribute>