diff options
| -rw-r--r-- | xslt/xml2csv.xslt | 9 | ||||
| -rw-r--r-- | xslt/xml2manualcsv.xslt | 14 |
2 files changed, 14 insertions, 9 deletions
diff --git a/xslt/xml2csv.xslt b/xslt/xml2csv.xslt index 25f5d8b7c..e4a40cc74 100644 --- a/xslt/xml2csv.xslt +++ b/xslt/xml2csv.xslt @@ -9,10 +9,10 @@ <xsl:template match="/divelog/dives"> <xsl:choose> <xsl:when test="$units = 1"> - <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"sample time"', $fs, '"sample depth (ft)"', $fs, '"sample temperature (F)"', $fs, '"sample pressure (psi)"')"/> + <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"sample time (min)"', $fs, '"sample depth (ft)"', $fs, '"sample temperature (F)"', $fs, '"sample pressure (psi)"', $fs, '"sample heartrate"')"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"sample time"', $fs, '"sample depth (m)"', $fs, '"sample temperature (C)"', $fs, '"sample pressure (bar)"')"/> + <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"sample time (min)"', $fs, '"sample depth (m)"', $fs, '"sample temperature (C)"', $fs, '"sample pressure (bar)"', $fs, '"sample heartrate"')"/> </xsl:otherwise> </xsl:choose> <xsl:text> @@ -72,6 +72,11 @@ </xsl:choose> </xsl:if> + <xsl:value-of select="$fs"/> + <xsl:if test="@heartbeat != ''"> + <xsl:value-of select="concat('"', @heartbeat, '"')"/> + </xsl:if> + <xsl:text> </xsl:text> </xsl:for-each> diff --git a/xslt/xml2manualcsv.xslt b/xslt/xml2manualcsv.xslt index 242332756..a2f941da0 100644 --- a/xslt/xml2manualcsv.xslt +++ b/xslt/xml2manualcsv.xslt @@ -13,10 +13,10 @@ <xsl:template match="/divelog/dives"> <xsl:choose> <xsl:when test="$units = 1"> - <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"duration"', $fs, '"maxdepth (ft)"', $fs, '"avgdepth (ft)"', $fs, '"airtemp (F)"', $fs, '"watertemp (F)"', $fs, '"cylinder size (cuft)"', $fs, '"startpressure (psi)"', $fs, '"endpressure (psi)"', $fs, '"o2"', $fs, '"he"', $fs, '"location"', $fs, '"gps"', $fs, '"divemaster"', $fs, '"buddy"', $fs, '"suit"', $fs, '"rating"', $fs, '"visibility"', $fs, '"notes"', $fs, '"weight (lbs)"', $fs, '"tags"')"/> + <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"duration (min)"', $fs, '"maxdepth (ft)"', $fs, '"avgdepth (ft)"', $fs, '"airtemp (F)"', $fs, '"watertemp (F)"', $fs, '"cylinder size (cuft)"', $fs, '"startpressure (psi)"', $fs, '"endpressure (psi)"', $fs, '"o2 (%)"', $fs, '"he (%)"', $fs, '"location"', $fs, '"gps"', $fs, '"divemaster"', $fs, '"buddy"', $fs, '"suit"', $fs, '"rating"', $fs, '"visibility"', $fs, '"notes"', $fs, '"weight (lbs)"', $fs, '"tags"')"/> </xsl:when> <xsl:otherwise> - <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"duration"', $fs, '"maxdepth (m)"', $fs, '"avgdepth (m)"', $fs, '"airtemp (C)"', $fs, '"watertemp (C)"', $fs, '"cylinder size (l)"', $fs, '"startpressure (bar)"', $fs, '"endpressure (bar)"', $fs, '"o2"', $fs, '"he"', $fs, '"location"', $fs, '"gps"', $fs, '"divemaster"', $fs, '"buddy"', $fs, '"suit"', $fs, '"rating"', $fs, '"visibility"', $fs, '"notes"', $fs, '"weight (kg)"', $fs, '"tags"')"/> + <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"duration (min)"', $fs, '"maxdepth (m)"', $fs, '"avgdepth (m)"', $fs, '"airtemp (C)"', $fs, '"watertemp (C)"', $fs, '"cylinder size (l)"', $fs, '"startpressure (bar)"', $fs, '"endpressure (bar)"', $fs, '"o2 (%)"', $fs, '"he (%)"', $fs, '"location"', $fs, '"gps"', $fs, '"divemaster"', $fs, '"buddy"', $fs, '"suit"', $fs, '"rating"', $fs, '"visibility"', $fs, '"notes"', $fs, '"weight (kg)"', $fs, '"tags"')"/> </xsl:otherwise> </xsl:choose> <xsl:text> @@ -40,7 +40,7 @@ <xsl:text>"</xsl:text> <xsl:value-of select="$fs"/> <xsl:text>"</xsl:text> - <xsl:value-of select="@duration"/> + <xsl:value-of select="substring-before(@duration, ' ')"/> <xsl:text>"</xsl:text> <xsl:choose> <xsl:when test="divecomputer[1]/depth/@mean|divecomputer[1]/depth/@max != ''"> @@ -123,11 +123,11 @@ <xsl:text>"</xsl:text> <xsl:value-of select="$fs"/> <xsl:text>"</xsl:text> - <xsl:value-of select="cylinder[1]/@o2"/> + <xsl:value-of select="substring-before(cylinder[1]/@o2, '%')"/> <xsl:text>"</xsl:text> <xsl:value-of select="$fs"/> <xsl:text>"</xsl:text> - <xsl:value-of select="cylinder[1]/@he"/> + <xsl:value-of select="substring-before(cylinder[1]/@he, '%')"/> <xsl:text>"</xsl:text> </xsl:otherwise> </xsl:choose> @@ -310,11 +310,11 @@ <xsl:text>"</xsl:text> <xsl:value-of select="$fs"/> <xsl:text>"</xsl:text> - <xsl:value-of select="@o2"/> + <xsl:value-of select="substring-before(@o2, '%')"/> <xsl:text>"</xsl:text> <xsl:value-of select="$fs"/> <xsl:text>"</xsl:text> - <xsl:value-of select="@he"/> + <xsl:value-of select="substring-before(@he, '%')"/> <xsl:text>"</xsl:text> </xsl:template> <xsl:template match="location"> |