From 05f5a1a0bc038451b9ebbed01e18680019280afc Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 25 Jul 2014 19:22:36 +0200
Subject: Moved result transformations into "99_result" * otherwise it is not
 easily possible to add additional datasource layers between the content and
 result generation level * changed meta url appropriately

---
 source/00_content/meta.xml           |  2 +-
 source/03_result/article/article.xsl | 51 ------------------------------------
 source/03_result/pages/page.xsl      | 36 -------------------------
 source/99_result/article/article.xsl | 51 ++++++++++++++++++++++++++++++++++++
 source/99_result/pages/page.xsl      | 36 +++++++++++++++++++++++++
 utility/master.xsl                   |  1 -
 6 files changed, 88 insertions(+), 89 deletions(-)
 delete mode 100644 source/03_result/article/article.xsl
 delete mode 100644 source/03_result/pages/page.xsl
 create mode 100644 source/99_result/article/article.xsl
 create mode 100644 source/99_result/pages/page.xsl

diff --git a/source/00_content/meta.xml b/source/00_content/meta.xml
index 8c1af22..dba506d 100644
--- a/source/00_content/meta.xml
+++ b/source/00_content/meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta>
 	<title>/home/adrian</title>
-	<url>/home/common/projects/dev/static_site_generator/target/03_result</url>
+	<url>/home/common/projects/dev/static_site_generator/target/99_result</url>
 </meta>
diff --git a/source/03_result/article/article.xsl b/source/03_result/article/article.xsl
deleted file mode 100644
index 69ddf09..0000000
--- a/source/03_result/article/article.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:output
-	method="xml"
-	omit-xml-declaration="no"
-	encoding="UTF-8"
-	indent="yes"
-/>
-
-<xsl:include href="[utility/master.xsl]"/>
-<xsl:include href="[utility/date-time.xsl]"/>
-
-<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"/>
-	<target     mode="xpath"   value="xalan:nodeset($datasource)/datasource/article/entry/@handle"/>
-</xsl:variable>
-
-<xsl:template name="title-text">
-	<xsl:value-of select="/datasource/article/entry/title"/>
-</xsl:template>
-
-<xsl:template match="article/entry">
-	<div class="last article">
-		<h2>
-			» <a href="{$url}/article/{@handle}"><xsl:value-of select="./title"/></a>
-		</h2>
-		<p class="info">
-			<xsl:call-template name="format-date">
-				<xsl:with-param name="date" select="./date"/>
-				<xsl:with-param name="format" select="'x. M Y'"/>
-			</xsl:call-template> 
-			| <xsl:for-each select="tags/tag">
-				<a href="{$url}/tag/{.}">
-					<xsl:value-of select="."/>
-				</a>
-			</xsl:for-each>
-			| Adrian Kummerländer
-		</p>
-		<xsl:copy-of select="./content/*"/>
-	</div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/source/03_result/pages/page.xsl b/source/03_result/pages/page.xsl
deleted file mode 100644
index 8fced90..0000000
--- a/source/03_result/pages/page.xsl
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-	version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-	xmlns:xalan="http://xml.apache.org/xalan"
-	xmlns:InputXSLT="function.inputxslt.application"
-	exclude-result-prefixes="xalan InputXSLT"
->
-
-<xsl:output
-	method="xml"
-	omit-xml-declaration="no"
-	encoding="UTF-8"
-	indent="yes"
-/>
-
-<xsl:include href="[utility/master.xsl]"/>
-
-<xsl:variable name="meta">
-	<datasource type="main"    mode="iterate" source="target/02_data/pages.xml"   target="page"/>
-	<datasource type="support" mode="full"    source="source/00_content/meta.xml" target="meta"/>
-	<target     mode="xpath"   value="xalan:nodeset($datasource)/datasource/page/entry/@handle"/>
-</xsl:variable>
-
-<xsl:template name="title-text">
-	<xsl:value-of select="/datasource/page/entry/title"/>
-</xsl:template>
-
-<xsl:template match="page/entry">
-	<div class="last article">
-		<h3><xsl:value-of select="./title"/></h3>
-		<xsl:copy-of select="./content/*"/>
-	</div>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/source/99_result/article/article.xsl b/source/99_result/article/article.xsl
new file mode 100644
index 0000000..69ddf09
--- /dev/null
+++ b/source/99_result/article/article.xsl
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xalan="http://xml.apache.org/xalan"
+	xmlns:InputXSLT="function.inputxslt.application"
+	exclude-result-prefixes="xalan InputXSLT"
+>
+
+<xsl:output
+	method="xml"
+	omit-xml-declaration="no"
+	encoding="UTF-8"
+	indent="yes"
+/>
+
+<xsl:include href="[utility/master.xsl]"/>
+<xsl:include href="[utility/date-time.xsl]"/>
+
+<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"/>
+	<target     mode="xpath"   value="xalan:nodeset($datasource)/datasource/article/entry/@handle"/>
+</xsl:variable>
+
+<xsl:template name="title-text">
+	<xsl:value-of select="/datasource/article/entry/title"/>
+</xsl:template>
+
+<xsl:template match="article/entry">
+	<div class="last article">
+		<h2>
+			» <a href="{$url}/article/{@handle}"><xsl:value-of select="./title"/></a>
+		</h2>
+		<p class="info">
+			<xsl:call-template name="format-date">
+				<xsl:with-param name="date" select="./date"/>
+				<xsl:with-param name="format" select="'x. M Y'"/>
+			</xsl:call-template> 
+			| <xsl:for-each select="tags/tag">
+				<a href="{$url}/tag/{.}">
+					<xsl:value-of select="."/>
+				</a>
+			</xsl:for-each>
+			| Adrian Kummerländer
+		</p>
+		<xsl:copy-of select="./content/*"/>
+	</div>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/source/99_result/pages/page.xsl b/source/99_result/pages/page.xsl
new file mode 100644
index 0000000..8fced90
--- /dev/null
+++ b/source/99_result/pages/page.xsl
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:xalan="http://xml.apache.org/xalan"
+	xmlns:InputXSLT="function.inputxslt.application"
+	exclude-result-prefixes="xalan InputXSLT"
+>
+
+<xsl:output
+	method="xml"
+	omit-xml-declaration="no"
+	encoding="UTF-8"
+	indent="yes"
+/>
+
+<xsl:include href="[utility/master.xsl]"/>
+
+<xsl:variable name="meta">
+	<datasource type="main"    mode="iterate" source="target/02_data/pages.xml"   target="page"/>
+	<datasource type="support" mode="full"    source="source/00_content/meta.xml" target="meta"/>
+	<target     mode="xpath"   value="xalan:nodeset($datasource)/datasource/page/entry/@handle"/>
+</xsl:variable>
+
+<xsl:template name="title-text">
+	<xsl:value-of select="/datasource/page/entry/title"/>
+</xsl:template>
+
+<xsl:template match="page/entry">
+	<div class="last article">
+		<h3><xsl:value-of select="./title"/></h3>
+		<xsl:copy-of select="./content/*"/>
+	</div>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/utility/master.xsl b/utility/master.xsl
index 01bfd3c..27d2a5d 100644
--- a/utility/master.xsl
+++ b/utility/master.xsl
@@ -65,4 +65,3 @@
 <xsl:template match="text()|@*"/>
 
 </xsl:stylesheet>
-
-- 
cgit v1.2.3