[PATCH 2/2] UDDF Export: Moved equipmentused to informationbeforedive section as per updated spec

[Martin Long]

Signed-off-by: Martin Long <martin at longhome.co.uk>
---
 xslt/uddf-export.xslt | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/xslt/uddf-export.xslt b/xslt/uddf-export.xslt
index 2b6f20e..4365702 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>
@@ -333,7 +347,7 @@
 
         </tankdata>
       </xsl:for-each>
-      
+
       <samples>
 
         <xsl:for-each select="divecomputer[1]/event | divecomputer[1]/sample">
@@ -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>
-- 
2.1.0