diff options
Removed need for prefixing datasource source attribute
* transformations contain one or more "datasource" meta nodes
** these nodes define the required datasources
** up until now it was required to define the whole path to the file to be loaded
* the implementation of directory linkage in b942f8e removed the underlying need for providing the source / target prefix
** this commit now updates the generation transformations to match this change
*** this simplifies the datasource definition process for the end-user
*** additionally it makes the target / source directories easier to maintain
* changed cleanage task implementation to remove the whole directory and recreate it from scratch
** otherwise directory linkage and in turn the whole generation failed when the target directory did not exist in the first place
* removed task reordering in the process transformation
** tasks are now processed exactly as they were scheduled
** this was changed so that e.g. the "00_content" directory is linked before the first datasource is required
Diffstat (limited to 'source/99_result')
-rw-r--r-- | source/99_result/archive.xsl | 6 | ||||
-rw-r--r-- | source/99_result/article/article.xsl | 4 | ||||
-rw-r--r-- | source/99_result/atom.xsl | 4 | ||||
-rw-r--r-- | source/99_result/category/category.xsl | 4 | ||||
-rw-r--r-- | source/99_result/page/page.xsl | 4 | ||||
-rw-r--r-- | source/99_result/stream.xsl | 6 | ||||
-rw-r--r-- | source/99_result/tag/tag.xsl | 4 |
7 files changed, 16 insertions, 16 deletions
diff --git a/source/99_result/archive.xsl b/source/99_result/archive.xsl index 4d459c4..a6e8bce 100644 --- a/source/99_result/archive.xsl +++ b/source/99_result/archive.xsl @@ -7,9 +7,9 @@ <xsl:include href="[utility/master.xsl]"/> <xsl:variable name="meta"> - <datasource type="main" mode="full" source="target/03_meta/articles.xml" target="articles"/> - <datasource type="support" mode="full" source="target/03_meta/meta.xml" target="meta"/> - <datasource type="support" mode="full" source="source/00_content/microblog.xml" target="microblog"/> + <datasource type="main" mode="full" source="03_meta/articles.xml" target="articles"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="support" mode="full" source="00_content/microblog.xml" target="microblog"/> <target mode="plain" value="archive/index.html"/> </xsl:variable> diff --git a/source/99_result/article/article.xsl b/source/99_result/article/article.xsl index bbde793..1a6d2eb 100644 --- a/source/99_result/article/article.xsl +++ b/source/99_result/article/article.xsl @@ -8,8 +8,8 @@ <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="target/03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="02_data/articles.xml" target="article"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> <target mode="xpath" value="concat(xalan:nodeset($datasource)/datasource/article/entry/@handle, '/index.html')"/> </xsl:variable> diff --git a/source/99_result/atom.xsl b/source/99_result/atom.xsl index da7f370..bfd038b 100644 --- a/source/99_result/atom.xsl +++ b/source/99_result/atom.xsl @@ -12,8 +12,8 @@ /> <xsl:variable name="meta"> - <datasource type="main" mode="full" source="target/02_data/articles.xml" target="articles"/> - <datasource type="support" mode="full" source="target/03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="full" source="02_data/articles.xml" target="articles"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> <target mode="plain" value="atom.xml"/> </xsl:variable> diff --git a/source/99_result/category/category.xsl b/source/99_result/category/category.xsl index e69640b..300b62f 100644 --- a/source/99_result/category/category.xsl +++ b/source/99_result/category/category.xsl @@ -9,8 +9,8 @@ <xsl:include href="[utility/master.xsl]"/> <xsl:variable name="meta"> - <datasource type="main" mode="iterate" source="target/03_meta/categories.xml" target="category"/> - <datasource type="support" mode="full" source="target/03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="03_meta/categories.xml" target="category"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> <target mode="xpath" value="concat(xalan:nodeset($datasource)/datasource/category/entry/@handle, '/index.html')"/> </xsl:variable> diff --git a/source/99_result/page/page.xsl b/source/99_result/page/page.xsl index 4bf62ba..ccee1de 100644 --- a/source/99_result/page/page.xsl +++ b/source/99_result/page/page.xsl @@ -7,8 +7,8 @@ <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="target/03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="02_data/pages.xml" target="page"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> <target mode="xpath" value="concat(xalan:nodeset($datasource)/datasource/page/entry/@handle, '/index.html')"/> </xsl:variable> diff --git a/source/99_result/stream.xsl b/source/99_result/stream.xsl index 526b8db..4d93a2c 100644 --- a/source/99_result/stream.xsl +++ b/source/99_result/stream.xsl @@ -8,9 +8,9 @@ <xsl:include href="[utility/date-time.xsl]"/> <xsl:variable name="meta"> - <datasource type="main" mode="iterate" source="target/03_meta/paginated_articles.xml" target="page"/> - <datasource type="support" mode="full" source="target/03_meta/meta.xml" target="meta"/> - <datasource type="support" mode="full" source="target/02_data/articles.xml" target="articles"/> + <datasource type="main" mode="iterate" source="03_meta/paginated_articles.xml" target="page"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="support" mode="full" source="02_data/articles.xml" target="articles"/> <target mode="xpath" value="concat(xalan:nodeset($datasource)/datasource/page/entry/@index, '/index.html')"/> </xsl:variable> diff --git a/source/99_result/tag/tag.xsl b/source/99_result/tag/tag.xsl index fd79a3c..511a64f 100644 --- a/source/99_result/tag/tag.xsl +++ b/source/99_result/tag/tag.xsl @@ -7,8 +7,8 @@ <xsl:include href="[utility/master.xsl]"/> <xsl:variable name="meta"> - <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"/> + <datasource type="main" mode="iterate" source="03_meta/tags.xml" target="tag"/> + <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> <target mode="xpath" value="concat(xalan:nodeset($datasource)/datasource/tag/entry/@handle, '/index.html')"/> </xsl:variable> |