summaryrefslogtreecommitdiffstats
path: root/xslt
diff options
context:
space:
mode:
authorGravatar Martin Long <martin@longhome.co.uk>2015-02-11 21:20:55 +0000
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-11 16:15:28 -0800
commitdca78fe6fc16a1a995989d8b700b72749f44637c (patch)
treeed71e91756c182b3523e5427477fe34b46bb31ca /xslt
parent9b6c546244da65f9db3c7f153cd49fd9b35e1afe (diff)
downloadsubsurface-dca78fe6fc16a1a995989d8b700b72749f44637c.tar.gz
UDDF Export: Moved equipmentused to informationbeforedive section as per updated spec
Signed-off-by: Martin Long <martin@longhome.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'xslt')
-rw-r--r--xslt/uddf-export.xslt30
1 files changed, 14 insertions, 16 deletions
diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt
index c3c1f35cc..4365702dc 100644
--- a/xslt/uddf-export.xslt
+++ b/xslt/uddf-export.xslt
@@ -279,6 +279,20 @@
<xsl:value-of select="format-number(substring-before(., ' ') + 273.15, '0.00')"/>
</airtemperature>
</xsl:for-each>
+ <xsl:variable name="trimmedweightlist">
+ <xsl:for-each select="weightsystem">
+ <weight>
+ <xsl:value-of select="substring-before(@weight, ' ')"/>
+ </weight>
+ </xsl:for-each>
+ </xsl:variable>
+ <xsl:if test="sum(xt:node-set($trimmedweightlist)/node()) >= 0">
+ <equipmentused>
+ <leadquantity>
+ <xsl:value-of select="sum(xt:node-set($trimmedweightlist)/node())"/>
+ </leadquantity>
+ </equipmentused>
+ </xsl:if>
<xsl:if test="parent::trip">
<tripmembership ref="trip{generate-id(..)}"/>
</xsl:if>
@@ -534,14 +548,6 @@
</samples>
<informationafterdive>
- <xsl:variable name="trimmedweightlist">
- <xsl:for-each select="weightsystem">
- <weight>
- <xsl:value-of select="substring-before(@weight, ' ')"/>
- </weight>
- </xsl:for-each>
- </xsl:variable>
-
<xsl:if test="node()/depth/@max != ''">
<greatestdepth>
<xsl:value-of select="substring-before(node()/depth/@max, ' ')"/>
@@ -605,14 +611,6 @@
</xsl:when>
</xsl:choose>
</visibility>
- <equipmentused>
- <leadquantity>
- <xsl:if test="sum(xt:node-set($trimmedweightlist)/node()) >= 0">
- <xsl:value-of select="sum(xt:node-set($trimmedweightlist)/node())"/>
- </xsl:if>
- </leadquantity>
- </equipmentused>
-
</informationafterdive>
</dive>