From e9caf75db0ba6cf0825b2f49ffb2b7a4b0b983a4 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sat, 2 Apr 2016 14:27:43 +0800
Subject: SDM import: fix logic for sample import

Seems that testing if BOOKMARK is empty is a bad idea. We end up not
getting any samples, but the ones containing a bookmark. So we need to
switch the logic to testing if BOOKMARK contains something and do those
tasks first and otherwise grab a regular sample.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/SuuntoSDM.xslt | 56 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 30 insertions(+), 26 deletions(-)

(limited to 'xslt')

diff --git a/xslt/SuuntoSDM.xslt b/xslt/SuuntoSDM.xslt
index 90cc5fdc5..d8d566643 100644
--- a/xslt/SuuntoSDM.xslt
+++ b/xslt/SuuntoSDM.xslt
@@ -188,7 +188,36 @@
       <!-- dive sample - all the depth and temp readings -->
       <xsl:for-each select="SAMPLE">
         <xsl:choose>
-          <xsl:when test="BOOKMARK = ''">
+          <xsl:when test="BOOKMARK != ''">
+            <xsl:choose>
+              <xsl:when test="substring-before(BOOKMARK, ':') = 'Heading'">
+                <event name="heading">
+                  <xsl:attribute name="value">
+                    <xsl:value-of select="substring-before(substring-after(BOOKMARK, ': '), '°')"/>
+                  </xsl:attribute>
+                  <xsl:attribute name="time">
+                    <xsl:call-template name="timeConvert">
+                      <xsl:with-param name="timeSec" select="SAMPLETIME"/>
+                      <xsl:with-param name="units" select="'si'"/>
+                    </xsl:call-template>
+                  </xsl:attribute>
+                </event>
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:if test="BOOKMARK != 'Surface'">
+                  <event name="{BOOKMARK}">
+                    <xsl:attribute name="time">
+                      <xsl:call-template name="timeConvert">
+                        <xsl:with-param name="timeSec" select="SAMPLETIME"/>
+                        <xsl:with-param name="units" select="'si'"/>
+                      </xsl:call-template>
+                    </xsl:attribute>
+                  </event>
+                </xsl:if>
+              </xsl:otherwise>
+            </xsl:choose>
+          </xsl:when>
+          <xsl:otherwise>
             <sample>
               <xsl:attribute name="time">
                 <xsl:call-template name="timeConvert">
@@ -211,31 +240,6 @@
                 </xsl:call-template>
               </xsl:attribute>
             </sample>
-          </xsl:when>
-          <xsl:when test="substring-before(BOOKMARK, ':') = 'Heading'">
-              <event name="heading">
-                <xsl:attribute name="value">
-                  <xsl:value-of select="substring-before(substring-after(BOOKMARK, ': '), '°')"/>
-                </xsl:attribute>
-                <xsl:attribute name="time">
-                  <xsl:call-template name="timeConvert">
-                    <xsl:with-param name="timeSec" select="SAMPLETIME"/>
-                    <xsl:with-param name="units" select="'si'"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-              </event>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:if test="BOOKMARK != 'Surface'">
-              <event name="{BOOKMARK}">
-                <xsl:attribute name="time">
-                  <xsl:call-template name="timeConvert">
-                    <xsl:with-param name="timeSec" select="SAMPLETIME"/>
-                    <xsl:with-param name="units" select="'si'"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-              </event>
-            </xsl:if>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>
-- 
cgit v1.2.3-70-g09d2