Signed-off-by: Miika Turkia <[email protected]> --- xslt/xml2csv.xslt | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/xslt/xml2csv.xslt b/xslt/xml2csv.xslt index 3ba6b85..86739a6 100644 --- a/xslt/xml2csv.xslt +++ b/xslt/xml2csv.xslt @@ -1,6 +1,7 @@ <?xml version="1.0"?> <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"> <xsl:strip-space elements="*"/> + <xsl:param name="units" select="units"/> <xsl:output method="text" encoding="UTF-8"/> <xsl:variable name="fs">,</xsl:variable> @@ -31,16 +32,37 @@ <xsl:value-of select="$fs"/> <xsl:value-of select="concat('"', substring-before(@time, ' '), '"')"/> <xsl:value-of select="$fs"/> - <xsl:value-of select="concat('"', substring-before(@depth, ' '), '"')"/> + <xsl:choose> + <xsl:when test="$units = 1"> + <xsl:value-of select="concat('"', format-number((substring-before(@depth, ' ') div 0.3048), '#.#'), ' ft"')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat('"', substring-before(@depth, ' '), '"')"/> + </xsl:otherwise> + </xsl:choose> <xsl:value-of select="$fs"/> <xsl:if test="@temp != ''"> - <xsl:value-of select="concat('"', substring-before(@temp, ' '), '"')"/> + <xsl:choose> + <xsl:when test="$units = 1"> + <xsl:value-of select="concat('"', format-number((substring-before(@temp, ' ') * 1.8) + 32, '#.#'), ' F"')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat('"', substring-before(@temp, ' '), '"')"/> + </xsl:otherwise> + </xsl:choose> </xsl:if> <xsl:value-of select="$fs"/> <xsl:if test="@pressure != ''"> - <xsl:value-of select="concat('"', substring-before(@pressure, ' '), '"')"/> + <xsl:choose> + <xsl:when test="$units = 1"> + <xsl:value-of select="concat('"', format-number((substring-before(@pressure, ' ') * 14.5037738007), '#'), ' psi"')"/> + </xsl:when> + <xsl:otherwise> + <xsl:value-of select="concat('"', substring-before(@pressure, ' '), '"')"/> + </xsl:otherwise> + </xsl:choose> </xsl:if> <xsl:text> -- 1.9.1 _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
