From 4ba1e1585033643d4c656d5962f12b2a3fdbfb9e Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Thu, 4 Sep 2014 19:39:34 +0200
Subject: Updated source tree datasource query to be more explicit *
 "00_content" directory is now explicitly referenced * added "source_tree"
 variable to task processing transformation ** changed datasource meta-tag
 expressions to reference "source_tree" instead of "$root/source"

---
 process.xsl                   | 2 ++
 source/01_data/articles.xsl   | 2 +-
 source/01_data/pages.xsl      | 2 +-
 source/01_data/tags.xsl       | 2 +-
 source/02_meta/categories.xsl | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/process.xsl b/process.xsl
index d013168..4010f4b 100644
--- a/process.xsl
+++ b/process.xsl
@@ -17,6 +17,8 @@
 
 <xsl:include href="utility/datasource.xsl"/>
 
+<xsl:variable name="source_tree" select="$root/source"/>
+
 <xsl:template name="create_link">
 	<xsl:param name="from"/>
 	<xsl:param name="to"/>
diff --git a/source/01_data/articles.xsl b/source/01_data/articles.xsl
index 3b3ac14..8737a6a 100644
--- a/source/01_data/articles.xsl
+++ b/source/01_data/articles.xsl
@@ -11,7 +11,7 @@
 <xsl:include href="[utility/datasource.xsl]"/>
 
 <xsl:variable name="meta">
-	<datasource type="main"  mode="expression" source="$root/source/directory[1]/directory" target="files"/>
+	<datasource type="main"  mode="expression" source="$source_tree/directory[@name = '00_content']/directory" target="files"/>
 	<target     mode="plain" value="articles.xml"/> 
 </xsl:variable>
 
diff --git a/source/01_data/pages.xsl b/source/01_data/pages.xsl
index fe0e54d..32de2bc 100644
--- a/source/01_data/pages.xsl
+++ b/source/01_data/pages.xsl
@@ -11,7 +11,7 @@
 <xsl:include href="[utility/datasource.xsl]"/>
 
 <xsl:variable name="meta">
-	<datasource type="main"  mode="expression" source="$root/source/directory[1]/directory" target="files"/>
+	<datasource type="main"  mode="expression" source="$source_tree/directory[@name = '00_content']/directory" target="files"/>
 	<target     mode="plain" value="pages.xml"/> 
 </xsl:variable>
 
diff --git a/source/01_data/tags.xsl b/source/01_data/tags.xsl
index bfd227b..c9e4b47 100644
--- a/source/01_data/tags.xsl
+++ b/source/01_data/tags.xsl
@@ -7,7 +7,7 @@
 <xsl:include href="[utility/datasource.xsl]"/>
 
 <xsl:variable name="meta">
-	<datasource type="main"  mode="expression" source="$root/source/directory[1]/directory" target="files"/>
+	<datasource type="main"  mode="expression" source="$source_tree/directory[@name = '00_content']/directory" target="files"/>
 	<target     mode="plain" value="tags.xml"/> 
 </xsl:variable>
 
diff --git a/source/02_meta/categories.xsl b/source/02_meta/categories.xsl
index c0075b0..9bb1287 100644
--- a/source/02_meta/categories.xsl
+++ b/source/02_meta/categories.xsl
@@ -10,8 +10,8 @@
 <xsl:include href="[utility/datasource.xsl]"/>
 
 <xsl:variable name="meta">
-	<datasource type="main"  mode="expression" source="$root/source/directory[1]/directory" target="files"/>
-	<datasource type="support" mode="full" source="01_data/pages.xml"   target="pages"/>
+	<datasource type="main"    mode="expression" source="$source_tree/directory[@name = '00_content']/directory" target="files"/>
+	<datasource type="support" mode="full"       source="01_data/pages.xml"                                      target="pages"/>
 	<target     mode="plain"   value="categories.xml"/> 
 </xsl:variable>
 
-- 
cgit v1.2.3