From 4833d6bd725e1db6fc6592815483b19939ea7a95 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Mon, 2 Nov 2015 18:35:39 +0200
Subject: Grab all gas mixes only when no tank data is given

Grabbing all gas mixes was added for Xdeep default cylinders, and it is
not required for other data sources that have tankdata info in the UDDF
file.

See #958

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/uddf.xslt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'xslt')

diff --git a/xslt/uddf.xslt b/xslt/uddf.xslt
index e15c27e01..d37bf6795 100644
--- a/xslt/uddf.xslt
+++ b/xslt/uddf.xslt
@@ -60,6 +60,9 @@
   </xsl:template>
 
   <xsl:template match="dive|u:dive|u1:dive">
+    <xsl:variable name="tankdata">
+      <xsl:value-of select="count(//tankdata|//u:tankdata|//u1:tankdata)"/>
+    </xsl:variable>
     <dive>
       <!-- Count the amount of temeprature samples during the dive -->
       <xsl:variable name="temperatureSamples">
@@ -278,7 +281,7 @@
         </xsl:for-each>
       </xsl:if>
 
-      <xsl:if test="/uddf/gasdefinitions != ''">
+      <xsl:if test="/uddf/gasdefinitions != '' and $tankdata = 0">
         <xsl:for-each select="/uddf/gasdefinitions/mix">
           <cylinder description="unknown">
             <xsl:attribute name="o2">
-- 
cgit v1.2.3-70-g09d2