From 980a4068ab2c6ac4e933dfc4303888a34ca16e2d Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 6 Sep 2014 21:39:49 +0200
Subject: Simplified access to datasource in target resolution

---
 detail/process.xsl                     | 2 +-
 source/99_result/article/article.xsl   | 2 +-
 source/99_result/category/category.xsl | 2 +-
 source/99_result/page/page.xsl         | 2 +-
 source/99_result/stream.xsl            | 2 +-
 source/99_result/tag/tag.xsl           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/detail/process.xsl b/detail/process.xsl
index 4010f4b..ba25939 100644
--- a/detail/process.xsl
+++ b/detail/process.xsl
@@ -132,7 +132,7 @@
 		<xsl:call-template name="resolve_target">
 			<xsl:with-param name="prefix"     select="$target_prefix"/>
 			<xsl:with-param name="target"     select="$target"/>
-			<xsl:with-param name="datasource" select="$datasource"/>
+			<xsl:with-param name="datasource" select="xalan:nodeset($datasource)/*[1]"/>
 		</xsl:call-template>
 	</xsl:variable>
 
diff --git a/source/99_result/article/article.xsl b/source/99_result/article/article.xsl
index 68ba2d8..b3046b5 100644
--- a/source/99_result/article/article.xsl
+++ b/source/99_result/article/article.xsl
@@ -10,7 +10,7 @@
 <xsl:variable name="meta">
 	<datasource type="main"    mode="iterate" source="01_data/articles.xml" target="article"/>
 	<datasource type="support" mode="full"    source="02_meta/meta.xml"     target="meta"/>
-	<target     mode="xpath"   value="concat(xalan:nodeset($datasource)/datasource/article/entry/@handle, '/index.html')"/>
+	<target     mode="xpath"   value="concat($datasource/article/entry/@handle, '/index.html')"/>
 </xsl:variable>
 
 <xsl:template name="title-text">
diff --git a/source/99_result/category/category.xsl b/source/99_result/category/category.xsl
index eb53cc6..a2c6db5 100644
--- a/source/99_result/category/category.xsl
+++ b/source/99_result/category/category.xsl
@@ -11,7 +11,7 @@
 <xsl:variable name="meta">
 	<datasource type="main"    mode="iterate" source="02_meta/categories.xml" target="category"/>
 	<datasource type="support" mode="full"    source="02_meta/meta.xml"       target="meta"/>
-	<target     mode="xpath"   value="concat(xalan:nodeset($datasource)/datasource/category/entry/@handle, '/index.html')"/>
+	<target     mode="xpath"   value="concat($datasource/category/entry/@handle, '/index.html')"/>
 </xsl:variable>
 
 <xsl:template name="title-text">
diff --git a/source/99_result/page/page.xsl b/source/99_result/page/page.xsl
index 3fb2431..1c1b5d0 100644
--- a/source/99_result/page/page.xsl
+++ b/source/99_result/page/page.xsl
@@ -9,7 +9,7 @@
 <xsl:variable name="meta">
 	<datasource type="main"    mode="iterate" source="01_data/pages.xml" target="page"/>
 	<datasource type="support" mode="full"    source="02_meta/meta.xml"  target="meta"/>
-	<target     mode="xpath"   value="concat(xalan:nodeset($datasource)/datasource/page/entry/@handle, '/index.html')"/>
+	<target     mode="xpath"   value="concat($datasource/page/entry/@handle, '/index.html')"/>
 </xsl:variable>
 
 <xsl:template name="title-text">
diff --git a/source/99_result/stream.xsl b/source/99_result/stream.xsl
index 8f9c9d6..9d5e8b5 100644
--- a/source/99_result/stream.xsl
+++ b/source/99_result/stream.xsl
@@ -11,7 +11,7 @@
 	<datasource type="main"    mode="iterate" source="02_meta/paginated_articles.xml" target="page"/>
 	<datasource type="support" mode="full"    source="02_meta/meta.xml"               target="meta"/>
 	<datasource type="support" mode="full"    source="01_data/articles.xml"           target="articles"/>
-	<target     mode="xpath"   value="concat(xalan:nodeset($datasource)/datasource/page/entry/@index, '/index.html')"/>
+	<target     mode="xpath"   value="concat($datasource/page/entry/@index, '/index.html')"/>
 </xsl:variable>
 
 <xsl:template name="title-text">
diff --git a/source/99_result/tag/tag.xsl b/source/99_result/tag/tag.xsl
index a941751..f64f526 100644
--- a/source/99_result/tag/tag.xsl
+++ b/source/99_result/tag/tag.xsl
@@ -9,7 +9,7 @@
 <xsl:variable name="meta">
 	<datasource type="main"    mode="iterate" source="02_meta/tags.xml" target="tag"/>
 	<datasource type="support" mode="full"    source="02_meta/meta.xml" target="meta"/>
-	<target     mode="xpath"   value="concat(xalan:nodeset($datasource)/datasource/tag/entry/@handle, '/index.html')"/>
+	<target     mode="xpath"   value="concat($datasource/tag/entry/@handle, '/index.html')"/>
 </xsl:variable>
 
 <xsl:template name="title-text">
-- 
cgit v1.2.3