[PATCH] Should use the common GetFieldByIndex on import

Miika Turkia miika.turkia at gmail.com
Sat Jan 31 09:09:21 PST 2015


Should have removed the getFieldByIndex template from these files when
it was moved to commonTemplates. Otherwise these imports wont work.

Signed-off-by: Miika Turkia <miika.turkia at gmail.com>
---
 xslt/sensuscsv.xslt     | 22 -----------------
 xslt/subsurfacecsv.xslt | 63 -------------------------------------------------
 2 files changed, 85 deletions(-)

diff --git a/xslt/sensuscsv.xslt b/xslt/sensuscsv.xslt
index f873e98..9d2b0e3 100644
--- a/xslt/sensuscsv.xslt
+++ b/xslt/sensuscsv.xslt
@@ -176,26 +176,4 @@
       </sample>
   </xsl:template>
 
-  <xsl:template name="getFieldByIndex">
-    <xsl:param name="index"/>
-    <xsl:param name="line"/>
-    <xsl:choose>
-      <xsl:when test="$index > 0">
-        <xsl:call-template name="getFieldByIndex">
-          <xsl:with-param name="index" select="$index -1"/>
-          <xsl:with-param name="line" select="substring-after($line, $fs)"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="substring-before($line,$fs) != ''">
-            <xsl:value-of select="substring-before($line,$fs)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$line"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
 </xsl:stylesheet>
diff --git a/xslt/subsurfacecsv.xslt b/xslt/subsurfacecsv.xslt
index cb59cc9..871d70f 100644
--- a/xslt/subsurfacecsv.xslt
+++ b/xslt/subsurfacecsv.xslt
@@ -384,67 +384,4 @@
     </xsl:if>
   </xsl:template>
 
-  <xsl:template name="getFieldByIndex">
-    <xsl:param name="index"/>
-    <xsl:param name="line"/>
-    <xsl:param name="remaining"/>
-    <xsl:choose>
-      <xsl:when test="$index > 0">
-        <xsl:choose>
-          <xsl:when test="substring($line, 1, 1) = '"'">
-            <xsl:call-template name="getFieldByIndex">
-              <xsl:with-param name="index" select="$index -1"/>
-              <xsl:with-param name="line" select="substring-after($line, $fs)"/>
-              <xsl:with-param name="remaining" select="$remaining"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="getFieldByIndex">
-              <xsl:with-param name="index" select="$index -1"/>
-              <xsl:with-param name="line" select="substring-after($line, $fs)"/>
-              <xsl:with-param name="remaining" select="$remaining"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="substring($line, 1, 1) = '"'">
-            <xsl:choose>
-              <xsl:when test="substring-before($line,'"$fs') != ''">
-                <xsl:value-of select="substring-before($line,'"$fs')"/>
-              </xsl:when>
-              <xsl:when test="substring-before(substring-after($line, '"'), '"') != '' and substring-after(substring-after($line, '"'), '"') = ''">
-                <xsl:value-of select="substring-before(substring-after($line, '"'), '"')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:choose>
-                  <xsl:when test="substring-after(substring-after($line, '"'), '"') = ''">
-                    <xsl:value-of select="concat(substring-after($line, '"'), $lf, substring-before($remaining, '"'))"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="substring-before(substring-after($line, '"'), '"')"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-
-          <xsl:otherwise>
-            <xsl:choose>
-              <xsl:when test="substring-before($line,$fs) != ''">
-                <xsl:value-of select="substring-before($line,$fs)"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:if test="substring-after($line, $fs) = ''">
-                  <xsl:value-of select="$line"/>
-                </xsl:if>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-  </xsl:template>
 </xsl:stylesheet>
-- 
1.9.1



More information about the subsurface mailing list