summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2014-07-16 14:04:15 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-16 09:21:01 -0700
commit796df27273dbbe7ae1824f14b1593e537dd94277 (patch)
tree4a647f6baa0d153064ba5fc086263288efb53fae
parent45acec0e25eda766b77b297509d78e2cd81ce706 (diff)
downloadsubsurface-796df27273dbbe7ae1824f14b1593e537dd94277.tar.gz
Index used cylinder properly on divelogs.de export
The wrong O2 percentage was due to not referring to the correct cylinder but grabbing any o2 value in any cylinder. While fixing this, I noticed that also end pressure was missing the cylinder selection, so fixing that as well. Fixes #626 Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--xslt/divelogs-export.xslt4
1 files changed, 2 insertions, 2 deletions
diff --git a/xslt/divelogs-export.xslt b/xslt/divelogs-export.xslt
index b13006d3b..50224280f 100644
--- a/xslt/divelogs-export.xslt
+++ b/xslt/divelogs-export.xslt
@@ -88,7 +88,7 @@
<xsl:value-of select="node()/sample[@pressure][last()]/@pressure"/>
</xsl:when>
<xsl:otherwise>
- <xsl:value-of select="cylinder[$cylinder]/@end"/>
+ <xsl:value-of select="cylinder[position() = $cylinder]/@end"/>
</xsl:otherwise>
</xsl:choose>
</CYLINDERENDPRESSURE>
@@ -99,7 +99,7 @@
</xsl:call-template>
</WEIGHT>
<O2PCT>
- <xsl:value-of select="substring-before(cylinder/@o2, '%')"/>
+ <xsl:value-of select="substring-before(cylinder[position() = $cylinder]/@o2, '%')"/>
</O2PCT>
<LOGNOTES>
<xsl:value-of select="notes"/>