diff options
-rw-r--r-- | xslt/SuuntoSDM.xslt | 56 |
1 files changed, 30 insertions, 26 deletions
diff --git a/xslt/SuuntoSDM.xslt b/xslt/SuuntoSDM.xslt index 90cc5fdc5..d8d566643 100644 --- a/xslt/SuuntoSDM.xslt +++ b/xslt/SuuntoSDM.xslt @@ -188,7 +188,36 @@ <!-- dive sample - all the depth and temp readings --> <xsl:for-each select="SAMPLE"> <xsl:choose> - <xsl:when test="BOOKMARK = ''"> + <xsl:when test="BOOKMARK != ''"> + <xsl:choose> + <xsl:when test="substring-before(BOOKMARK, ':') = 'Heading'"> + <event name="heading"> + <xsl:attribute name="value"> + <xsl:value-of select="substring-before(substring-after(BOOKMARK, ': '), '°')"/> + </xsl:attribute> + <xsl:attribute name="time"> + <xsl:call-template name="timeConvert"> + <xsl:with-param name="timeSec" select="SAMPLETIME"/> + <xsl:with-param name="units" select="'si'"/> + </xsl:call-template> + </xsl:attribute> + </event> + </xsl:when> + <xsl:otherwise> + <xsl:if test="BOOKMARK != 'Surface'"> + <event name="{BOOKMARK}"> + <xsl:attribute name="time"> + <xsl:call-template name="timeConvert"> + <xsl:with-param name="timeSec" select="SAMPLETIME"/> + <xsl:with-param name="units" select="'si'"/> + </xsl:call-template> + </xsl:attribute> + </event> + </xsl:if> + </xsl:otherwise> + </xsl:choose> + </xsl:when> + <xsl:otherwise> <sample> <xsl:attribute name="time"> <xsl:call-template name="timeConvert"> @@ -211,31 +240,6 @@ </xsl:call-template> </xsl:attribute> </sample> - </xsl:when> - <xsl:when test="substring-before(BOOKMARK, ':') = 'Heading'"> - <event name="heading"> - <xsl:attribute name="value"> - <xsl:value-of select="substring-before(substring-after(BOOKMARK, ': '), '°')"/> - </xsl:attribute> - <xsl:attribute name="time"> - <xsl:call-template name="timeConvert"> - <xsl:with-param name="timeSec" select="SAMPLETIME"/> - <xsl:with-param name="units" select="'si'"/> - </xsl:call-template> - </xsl:attribute> - </event> - </xsl:when> - <xsl:otherwise> - <xsl:if test="BOOKMARK != 'Surface'"> - <event name="{BOOKMARK}"> - <xsl:attribute name="time"> - <xsl:call-template name="timeConvert"> - <xsl:with-param name="timeSec" select="SAMPLETIME"/> - <xsl:with-param name="units" select="'si'"/> - </xsl:call-template> - </xsl:attribute> - </event> - </xsl:if> </xsl:otherwise> </xsl:choose> </xsl:for-each> |