From 1b1d2cec7638e7af08c5cff2c0799aa9605fb58d Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Wed, 29 Oct 2014 17:31:13 +0100
Subject: Fixed transformation datasource query * recent commit `71a637` in
 upstream _InputXSLT_ activated namespace comprehension for
 `InputXSLT:read-file` and `InputXSLT:external-command` ** this enabled both a
 simplification of the meta variable query and forced a namespace-independent
 version of the main and support datasource query

---
 src/steps/process.xsl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/steps/process.xsl b/src/steps/process.xsl
index 67c7f24..9b9552a 100644
--- a/src/steps/process.xsl
+++ b/src/steps/process.xsl
@@ -168,10 +168,11 @@
 <xsl:template name="process">
 	<xsl:param name="task"/>
 
-	<xsl:variable name="transformation" select="InputXSLT:read-file($task/source)/self::file/node()"/>
-	<xsl:variable name="meta"           select="$transformation/self::*[name() = 'xsl:stylesheet']/*[name() = 'xsl:variable' and @name = 'meta']"/>
-	<xsl:variable name="main_source"    select="$meta/datasource[@type = 'main']"/>
-	<xsl:variable name="support_source" select="$meta/datasource[@type = 'support']"/>
+	<xsl:variable name="transformation" select="InputXSLT:read-file($task/source)/self::file/xsl:stylesheet"/>
+	<xsl:variable name="meta"           select="$transformation/self::xsl:stylesheet/xsl:variable[@name = 'meta']"/>
+	<xsl:variable name="main_source"    select="$meta/*[local-name() = 'datasource' and @type = 'main']"/>
+	<xsl:variable name="support_source" select="$meta/*[local-name() = 'datasource' and @type = 'support']"/>
+	<xsl:variable name="target"         select="$meta/*[local-name() = 'target']"/>
 
 	<xsl:choose>
 		<xsl:when test="$main_source/@mode = 'iterate'">
@@ -188,7 +189,7 @@
 					<xsl:with-param name="transformation"    select="$transformation"/>
 					<xsl:with-param name="datasource_prefix" select="$task/meta/datasource_prefix"/>
 					<xsl:with-param name="target_prefix"     select="$task/target"/>
-					<xsl:with-param name="target"            select="$meta/target"/>
+					<xsl:with-param name="target"            select="$target"/>
 				</xsl:call-template>
 			</xsl:for-each>
 		</xsl:when>
@@ -221,7 +222,7 @@
 				<xsl:with-param name="transformation"    select="$transformation"/>
 				<xsl:with-param name="datasource_prefix" select="$task/meta/datasource_prefix"/>
 				<xsl:with-param name="target_prefix"     select="$task/target"/>
-				<xsl:with-param name="target"            select="$meta/target"/>
+				<xsl:with-param name="target"            select="$target"/>
 			</xsl:call-template>
 		</xsl:otherwise>
 	</xsl:choose>
-- 
cgit v1.2.3