X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=xslt%2FSuuntoSDM.xslt;h=ed130ae2c79d025b7c9d558e6c00c7a9077038f9;hb=36e4abf8c0aaee9ab61f65a0928073ab2bc2f132;hp=391bdf8c4d33f23ecbd8279cf973d1eed9877a0f;hpb=12f2c2ed5cbf45f13c63af4eb778833cd21e8ce4;p=ext%2Fsubsurface.git

diff --git a/xslt/SuuntoSDM.xslt b/xslt/SuuntoSDM.xslt
index 391bdf8..ed130ae 100644
--- a/xslt/SuuntoSDM.xslt
+++ b/xslt/SuuntoSDM.xslt
@@ -62,6 +62,14 @@
         </xsl:otherwise>
       </xsl:choose>
 
+      <xsl:if test="WEIGTH != ''">
+        <weightsystem>
+          <xsl:attribute name="weight">
+            <xsl:value-of select="concat(WEIGTH, ' kg')"/>
+          </xsl:attribute>
+        </weightsystem>
+      </xsl:if>
+
       <notes>
       <xsl:if test="LOGNOTES != ''">
         <xsl:value-of select="LOGNOTES" />
@@ -69,6 +77,9 @@
       <xsl:if test="WEATHER != ''">
         Weather: <xsl:value-of select="WEATHER" />
       </xsl:if>
+      <xsl:if test="WATERVISIBILITYDESC != ''">
+        Visibility: <xsl:value-of select="WATERVISIBILITYDESC" />
+      </xsl:if>
       </notes>
 
 <!-- FIXME: add support for multiple cylinders, need sample data -->
@@ -86,10 +97,15 @@
           <xsl:value-of select="concat(HEPCT, '%')"/>
         </xsl:attribute>
       </xsl:if>
+      <xsl:if test="CYLINDERDESCRIPTION != ''">
+        <xsl:attribute name="description">
+          <xsl:value-of select="CYLINDERDESCRIPTION"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:if test="CYLINDERSIZE != ''">
         <xsl:attribute name="size">
             <xsl:choose>
-              <xsl:when test="CYLINDERWORKPRESSURE = '0'">
+              <xsl:when test="CYLINDERUNITS = '0'">
                 <xsl:value-of select="concat(CYLINDERSIZE, ' l')"/>
               </xsl:when>
               <xsl:otherwise>
@@ -219,7 +235,12 @@
   <xsl:template name="cuft2l">
     <xsl:param name="size"/>
     <xsl:param name="pressure"/>
-    <xsl:value-of select="concat(format-number((($size*28.3168466) div ($pressure div 1013.25)), '0.000'), ' l')" />
+    <xsl:choose>
+      <xsl:when test="$pressure != '0'">
+        <xsl:value-of select="concat(format-number((($size*28.3168466) div ($pressure div 1013.25)), '0.000'), ' l')" />
+      </xsl:when>
+      <xsl:otherwise>0</xsl:otherwise>
+    </xsl:choose>
   </xsl:template>
   <!-- end cuft2l -->