diff options
| -rw-r--r-- | xslt/xml2csv.xslt | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/xslt/xml2csv.xslt b/xslt/xml2csv.xslt index 211597325..25f5d8b7c 100644 --- a/xslt/xml2csv.xslt +++ b/xslt/xml2csv.xslt @@ -7,7 +7,14 @@ <xsl:variable name="fs">,</xsl:variable> <xsl:template match="/divelog/dives"> - <xsl:value-of select="concat('"dive number"', $fs, '"date"', $fs, '"time"', $fs, '"sample time"', $fs, '"sample depth"', $fs, '"sample temperature"', $fs, '"sample pressure"')"/> + <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: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:otherwise> + </xsl:choose> <xsl:text> </xsl:text> <xsl:apply-templates select="dive|trip/dive"/> @@ -34,7 +41,7 @@ <xsl:value-of select="$fs"/> <xsl:choose> <xsl:when test="$units = 1"> - <xsl:value-of select="concat('"', round((substring-before(@depth, ' ') div 0.3048) * 1000) div 1000, ' ft"')"/> + <xsl:value-of select="concat('"', round((substring-before(@depth, ' ') div 0.3048) * 1000) div 1000, '"')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="concat('"', round(substring-before(@depth, ' ') * 1000) div 1000, '"')"/> @@ -45,7 +52,7 @@ <xsl:if test="@temp != ''"> <xsl:choose> <xsl:when test="$units = 1"> - <xsl:value-of select="concat('"', format-number((substring-before(@temp, ' ') * 1.8) + 32, '#.#'), ' F"')"/> + <xsl:value-of select="concat('"', format-number((substring-before(@temp, ' ') * 1.8) + 32, '#.#'), '"')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="concat('"', substring-before(@temp, ' '), '"')"/> @@ -57,7 +64,7 @@ <xsl:if test="@pressure != ''"> <xsl:choose> <xsl:when test="$units = 1"> - <xsl:value-of select="concat('"', format-number((substring-before(@pressure, ' ') * 14.5037738007), '#'), ' psi"')"/> + <xsl:value-of select="concat('"', format-number((substring-before(@pressure, ' ') * 14.5037738007), '#'), '"')"/> </xsl:when> <xsl:otherwise> <xsl:value-of select="concat('"', substring-before(@pressure, ' '), '"')"/> |