From b87c8b2a6c9beb57d3959663c0d316207629ab9b Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Sat, 26 Jul 2014 13:38:05 +0200
Subject: Added meta datasource * merges the content of the
 "00_content/meta.xml" file with additional data such as the available tags *
 simplifies providing a basic datasource to every result transformation *
 modified master, article and tag page template accordingly

---
 source/99_result/article/article.xsl | 3 +--
 source/99_result/tag/tag.xsl         | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'source/99_result')

diff --git a/source/99_result/article/article.xsl b/source/99_result/article/article.xsl
index 8801a60..9c5cd3e 100644
--- a/source/99_result/article/article.xsl
+++ b/source/99_result/article/article.xsl
@@ -19,8 +19,7 @@
 
 <xsl:variable name="meta">
 	<datasource type="main"    mode="iterate" source="target/02_data/articles.xml" target="article"/>
-	<datasource type="support" mode="full"    source="source/00_content/meta.xml"  target="meta"/>
-	<datasource type="support" mode="full"    source="target/02_data/tags.xml"     target="tags"/>
+	<datasource type="support" mode="full"    source="target/03_meta/meta.xml" target="meta"/>
 	<target     mode="xpath"   value="xalan:nodeset($datasource)/datasource/article/entry/@handle"/>
 </xsl:variable>
 
diff --git a/source/99_result/tag/tag.xsl b/source/99_result/tag/tag.xsl
index 6ab11bf..0ed3007 100644
--- a/source/99_result/tag/tag.xsl
+++ b/source/99_result/tag/tag.xsl
@@ -18,9 +18,8 @@
 <xsl:include href="[utility/date-time.xsl]"/>
 
 <xsl:variable name="meta">
-	<datasource type="main"    mode="iterate" source="target/03_meta/tags.xml"    target="tag"/>
-	<datasource type="support" mode="full"    source="source/00_content/meta.xml" target="meta"/>
-	<datasource type="support" mode="full"    source="target/02_data/tags.xml"    target="tags"/>
+	<datasource type="main"    mode="iterate" source="target/03_meta/tags.xml" target="tag"/>
+	<datasource type="support" mode="full"    source="target/03_meta/meta.xml" target="meta"/>
 	<target     mode="xpath"   value="xalan:nodeset($datasource)/datasource/tag/entry/@handle"/>
 </xsl:variable>
 
-- 
cgit v1.2.3