From 21d8d26da160e7480d663d518e1b9d6b1fee2394 Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Fri, 31 Jul 2015 08:19:39 +0300
Subject: CSV import: imperial support for cylinder pressure

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/manualcsv2xml.xslt | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/xslt/manualcsv2xml.xslt b/xslt/manualcsv2xml.xslt
index 769092664..cae2b62e1 100644
--- a/xslt/manualcsv2xml.xslt
+++ b/xslt/manualcsv2xml.xslt
@@ -272,18 +272,38 @@
           </xsl:if>
           <xsl:if test="$startpressureField &gt; 0">
             <xsl:attribute name="start">
-              <xsl:call-template name="getFieldByIndex">
-                <xsl:with-param name="index" select="$startpressureField"/>
-                <xsl:with-param name="line" select="$line"/>
-              </xsl:call-template>
+              <xsl:variable name="start">
+                <xsl:call-template name="getFieldByIndex">
+                  <xsl:with-param name="index" select="$startpressureField"/>
+                  <xsl:with-param name="line" select="$line"/>
+                </xsl:call-template>
+              </xsl:variable>
+              <xsl:choose>
+                <xsl:when test="$units = 0">
+                  <xsl:value-of select="$start"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="format-number($start div 14.5037738, '#.###')"/>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:attribute>
           </xsl:if>
           <xsl:if test="$endpressureField &gt; 0">
             <xsl:attribute name="end">
-              <xsl:call-template name="getFieldByIndex">
-                <xsl:with-param name="index" select="$endpressureField"/>
-                <xsl:with-param name="line" select="$line"/>
-              </xsl:call-template>
+              <xsl:variable name="end">
+                <xsl:call-template name="getFieldByIndex">
+                  <xsl:with-param name="index" select="$endpressureField"/>
+                  <xsl:with-param name="line" select="$line"/>
+                </xsl:call-template>
+              </xsl:variable>
+              <xsl:choose>
+                <xsl:when test="$units = 0">
+                  <xsl:value-of select="$end"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="format-number($end div 14.5037738, '#.###')"/>
+                </xsl:otherwise>
+              </xsl:choose>
             </xsl:attribute>
           </xsl:if>
           <xsl:if test="$o2Field &gt; 0">
-- 
cgit v1.2.3-70-g09d2