[PATCH 2/5] Store more cylinder information on manual CSV export

[Miika Turkia]

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 xslt/xml2manualcsv.xslt | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/xslt/xml2manualcsv.xslt b/xslt/xml2manualcsv.xslt
index bf7fb30..b206061 100644
--- a/xslt/xml2manualcsv.xslt
+++ b/xslt/xml2manualcsv.xslt
@@ -6,7 +6,7 @@
   <xsl:variable name="fs">,</xsl:variable>
 
   <xsl:template match="/divelog/dives">
-    <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"duration"', $fs, '"maxdepth"', $fs, '"avgdepth"', $fs, '"airtemp"', $fs, '"watertemp"', $fs, '"startpressure"', $fs, '"endpressure"', $fs, '"location"', $fs, '"gps"', $fs, '"divemaster"', $fs, '"buddy"', $fs, '"suit"', $fs, '"rating"', $fs, '"visibility"', $fs, '"notes"')"/>
+    <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"duration"', $fs, '"maxdepth"', $fs, '"avgdepth"', $fs, '"airtemp"', $fs, '"watertemp"', $fs, '"cylinder size"', $fs, '"startpressure"', $fs, '"endpressure"', $fs, '"o2"', $fs, '"he"', $fs, '"location"', $fs, '"gps"', $fs, '"divemaster"', $fs, '"buddy"', $fs, '"suit"', $fs, '"rating"', $fs, '"visibility"', $fs, '"notes"')"/>
     <xsl:text>
 </xsl:text>
     <xsl:apply-templates select="dive|trip/dive"/>
@@ -44,12 +44,24 @@
       <xsl:otherwise>
         <xsl:value-of select="$fs"/>
         <xsl:text>"</xsl:text>
+        <xsl:value-of select="cylinder[1]/@size"/>
+        <xsl:text>"</xsl:text>
+        <xsl:value-of select="$fs"/>
+        <xsl:text>"</xsl:text>
         <xsl:value-of select="divecomputer[1]/sample[@pressure]/@pressure"/>
         <xsl:text>"</xsl:text>
         <xsl:value-of select="$fs"/>
         <xsl:text>"</xsl:text>
         <xsl:value-of select="divecomputer[1]/sample[@pressure][last()]/@pressure"/>
         <xsl:text>"</xsl:text>
+        <xsl:value-of select="$fs"/>
+        <xsl:text>"</xsl:text>
+        <xsl:value-of select="cylinder[1]/@o2"/>
+        <xsl:text>"</xsl:text>
+        <xsl:value-of select="$fs"/>
+        <xsl:text>"</xsl:text>
+        <xsl:value-of select="cylinder[1]/@he"/>
+        <xsl:text>"</xsl:text>
       </xsl:otherwise>
     </xsl:choose>
     <xsl:apply-templates select="location"/>
@@ -113,12 +125,24 @@
   <xsl:template match="cylinder">
     <xsl:value-of select="$fs"/>
     <xsl:text>"</xsl:text>
+    <xsl:value-of select="@size"/>
+    <xsl:text>"</xsl:text>
+    <xsl:value-of select="$fs"/>
+    <xsl:text>"</xsl:text>
     <xsl:value-of select="@start"/>
     <xsl:text>"</xsl:text>
     <xsl:value-of select="$fs"/>
     <xsl:text>"</xsl:text>
     <xsl:value-of select="@end"/>
     <xsl:text>"</xsl:text>
+    <xsl:value-of select="$fs"/>
+    <xsl:text>"</xsl:text>
+    <xsl:value-of select="@o2"/>
+    <xsl:text>"</xsl:text>
+    <xsl:value-of select="$fs"/>
+    <xsl:text>"</xsl:text>
+    <xsl:value-of select="@he"/>
+    <xsl:text>"</xsl:text>
   </xsl:template>
   <xsl:template match="location">
     <xsl:value-of select="$fs"/>
-- 
1.9.1