Restructured to enable automatic datasources

* i.e. first the content source is mapped
* after that every transformation in 'template/datasource/' is called using the content map as input
** the output of the datasource transformations is stored in 'datasource/'

8 files changed, 87 insertions, 134 deletions

diff --git a/datasource.xsl b/datasource.xsl
deleted file mode 100644
index 698ca67..0000000
--- a/datasource.xsl
+++ /dev/null
@@ -1,38 +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/reader.xsl"/>
-<xsl:include href="datasource/entry.xsl"/>
-
-<xsl:template match="data/source">
-	<datasource>
-		<xsl:apply-templates select="@*|node()"/>
-	</datasource>
-</xsl:template>
-
-<xsl:template match="source/pages">
-	<pages>
-		<xsl:apply-templates select="./*"/>
-	</pages>
-</xsl:template>
-
-<xsl:template match="file[./extension = '.md']">
-	<xsl:call-template name="entry">
-		<xsl:with-param name="file" select="."/>
-	</xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/datasource/entry.xsl b/datasource/entry.xsl
deleted file mode 100644
index 4ea6162..0000000
--- a/datasource/entry.xsl
+++ /dev/null
@@ -1,33 +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:include href="[utility/formatter.xsl]"/>
-
-<xsl:template name="entry">
-	<xsl:param name="file"/>
-
-	<entry handle="{$file/name}">
-		<xsl:choose>
-			<xsl:when test="$file/extension = '.md'">
-				<xsl:call-template name="formatter">
-					<xsl:with-param name="format">/usr/bin/markdown</xsl:with-param>
-					<xsl:with-param name="source" select="InputXSLT:read-file($file/full)/text()"/>
-				</xsl:call-template>
-			</xsl:when>
-			<xsl:when test="$file/extension = '.xml'">
-				<xsl:copy-of select="InputXSLT:read-file($file/full)/*"/>
-			</xsl:when>
-			<xsl:otherwise>
-				<xsl:copy-of select="InputXSLT:read-file($file/full)/text()"/>
-			</xsl:otherwise>
-		</xsl:choose>
-	</entry>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/generate.xsl b/generate.xsl
index f307085..65a49f3 100644
--- a/generate.xsl
+++ b/generate.xsl
@@ -15,6 +15,7 @@
 />
 
 <xsl:include href="utility/transformer.xsl"/>
+<xsl:include href="utility/generator.xsl"/>
 
 <xsl:variable name="context" select="/"/>
 
@@ -33,20 +34,37 @@
 	</xsl:call-template>
 </xsl:template>
 
-<xsl:template match="meta">
-	<xsl:call-template name="transform_in_context">
-		<xsl:with-param name="transformation">[result.xsl]</xsl:with-param>
+<xsl:template name="generate_in_context">
+	<xsl:param name="input"/>
+	<xsl:param name="transformation"/>
+	<xsl:param name="target"/>
+
+	<xsl:call-template name="generator">
 		<xsl:with-param name="input">
-			<xsl:call-template name="transform_in_context">
-				<xsl:with-param name="transformation">[datasource.xsl]</xsl:with-param>
-				<xsl:with-param name="input">
-					<xsl:call-template name="transform_in_context">
-						<xsl:with-param name="transformation">[source.xsl]</xsl:with-param>
-					</xsl:call-template>
-				</xsl:with-param>
-			</xsl:call-template>
+			<data>
+				<xsl:copy-of select="$context"/>
+				<xsl:copy-of select="$input"/>
+			</data>
 		</xsl:with-param>
+		<xsl:with-param name="transformation" select="$transformation"/>
+		<xsl:with-param name="target"         select="$target"/>
 	</xsl:call-template>
 </xsl:template>
 
+<xsl:template match="meta">
+	<xsl:variable name="source">
+		<xsl:call-template name="transform_in_context">
+			<xsl:with-param name="transformation">[source.xsl]</xsl:with-param>
+		</xsl:call-template>
+	</xsl:variable>
+
+	<xsl:for-each select="InputXSLT:read-directory(./source/datasource)/entry[./extension = '.xsl']">
+		<xsl:call-template name="generate_in_context">
+			<xsl:with-param name="input"          select="$source"/>
+			<xsl:with-param name="transformation" select="./full"/>
+			<xsl:with-param name="target"         select="concat($context/meta/target/datasource, '/', ./name, '.xml')"/>
+		</xsl:call-template>
+	</xsl:for-each>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/meta.xml b/meta.xml
index 3d6fcbc..0c0e67c 100644
--- a/meta.xml
+++ b/meta.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <meta>
 	<title>/home/adrian</title>
-	<base>/home/common/projects/dev/static_site_generator</base>
 	<target>
-		<url>/home/common/projects/dev/static_site_generator/result</url>
-		<directory>/home/common/projects/dev/static_site_generator/result</directory>
+		<datasource>/home/common/projects/dev/static_site_generator/datasource</datasource>
+		<output>/home/common/projects/dev/static_site_generator/result</output>
+		<public>/home/common/projects/dev/static_site_generator/result</public>
 	</target>
 	<source>
-		<directory>/home/common/projects/dev/static_site_generator/source</directory>
+		<content>/home/common/projects/dev/static_site_generator/source</content>
+		<datasource>/home/common/projects/dev/static_site_generator/template/datasource</datasource>
+		<output>/home/common/projects/dev/static_site_generator/template/output</output>
 	</source>
 </meta>
diff --git a/result.xsl b/result.xsl
deleted file mode 100644
index 1597664..0000000
--- a/result.xsl
+++ /dev/null
@@ -1,48 +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/generator.xsl"/>
-
-<xsl:variable name="meta" select="/data/meta"/>
-
-<xsl:template match="data/datasource">
-	<result>
-		<xsl:apply-templates select="@*|node()"/>
-	</result>
-</xsl:template>
-
-<xsl:template match="datasource/pages">
-	<pages>
-		<xsl:apply-templates select="./*"/>
-	</pages>
-</xsl:template>
-
-<xsl:template match="pages/entry">
-	<xsl:call-template name="generator">
-		<xsl:with-param name="input">
-			<data>
-				<xsl:copy-of select="$meta"/>
-				<xsl:copy-of select="."/>
-			</data>
-		</xsl:with-param>
-		<xsl:with-param name="transformation">[template/page.xsl]</xsl:with-param>
-		<xsl:with-param name="target">
-			<xsl:value-of select="$meta/target/directory"/>/pages/<xsl:value-of select="./@handle"/>
-		</xsl:with-param>
-	</xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/template/datasource/pages.xsl b/template/datasource/pages.xsl
new file mode 100644
index 0000000..7de4b4b
--- /dev/null
+++ b/template/datasource/pages.xsl
@@ -0,0 +1,52 @@
+<?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/formatter.xsl]"/>
+
+<xsl:template match="data">
+	<datasource>
+		<xsl:apply-templates />
+	</datasource>
+</xsl:template>
+
+<xsl:template match="text()|@*"/>
+
+<xsl:template match="source/pages">
+	<pages>
+		<xsl:apply-templates select="./*"/>
+	</pages>
+</xsl:template>
+
+<xsl:template match="file[./extension = '.md']">
+	<entry handle="{./name}">
+		<xsl:choose>
+			<xsl:when test="./extension = '.md'">
+				<xsl:call-template name="formatter">
+					<xsl:with-param name="format">/usr/bin/markdown</xsl:with-param>
+					<xsl:with-param name="source" select="InputXSLT:read-file(./full)/text()"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:when test="./extension = '.xml'">
+				<xsl:copy-of select="InputXSLT:read-file(./full)/*"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:copy-of select="InputXSLT:read-file(./full)/text()"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</entry>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/template/master.xsl b/template/output/master.xsl
index e2b77b4..e2b77b4 100644
--- a/template/master.xsl
+++ b/template/output/master.xsl
diff --git a/template/page.xsl b/template/output/page.xsl
index a271e4a..a271e4a 100644
--- a/template/page.xsl
+++ b/template/output/page.xsl