From dca78fe6fc16a1a995989d8b700b72749f44637c Mon Sep 17 00:00:00 2001
From: Martin Long <martin@longhome.co.uk>
Date: Wed, 11 Feb 2015 21:20:55 +0000
Subject: 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>
---
 xslt/uddf-export.xslt | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

(limited to 'xslt/uddf-export.xslt')

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>
-- 
cgit v1.2.3-70-g09d2