diff options
Revamped transformation layout to remove need for the "01_files" level
* "01_files" contained a single "source" transformation which listed the contents of the "00_content" level
** this was unnecessary as the base "list" transformation already lists the contents of all levels
* added new "expression" mode to datasource meta tag processing in the task processing transformation
** this expression modes allows for the evaluation of arbitrary XPath statements
*** e.g. a query to the results of "list.xsl"
* modified base transformation datasource structures to include the level and meta tree
* modified all existing content transformations to query the level-tree instead of the deprecated "source.xml"
** i.e. XPath statements
** the main change is that directories are available as "directory" nodes instead of nodes named by the directory name
* these changes where implemented to simplify the architecture and to increase flexibility
Diffstat (limited to 'source/99_result')
| -rw-r--r-- | source/99_result/archive.xsl | 4 | ||||
| -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, 15 insertions, 15 deletions
diff --git a/source/99_result/archive.xsl b/source/99_result/archive.xsl index a6e8bce..62861a5 100644 --- a/source/99_result/archive.xsl +++ b/source/99_result/archive.xsl @@ -7,8 +7,8 @@ <xsl:include href="[utility/master.xsl]"/> <xsl:variable name="meta"> - <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="main" mode="full" source="02_meta/articles.xml" target="articles"/> + <datasource type="support" mode="full" source="02_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 0dadf76..68ba2d8 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="02_data/articles.xml" target="article"/> - <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="01_data/articles.xml" target="article"/> + <datasource type="support" mode="full" source="02_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 c2cced8..e67f89c 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="02_data/articles.xml" target="articles"/> - <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="full" source="01_data/articles.xml" target="articles"/> + <datasource type="support" mode="full" source="02_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 300b62f..ce6cb1d 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="03_meta/categories.xml" target="category"/> - <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="02_meta/categories.xml" target="category"/> + <datasource type="support" mode="full" source="02_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 ccee1de..3fb2431 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="02_data/pages.xml" target="page"/> - <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="01_data/pages.xml" target="page"/> + <datasource type="support" mode="full" source="02_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 7db2410..8f9c9d6 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="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"/> + <datasource type="main" mode="iterate" source="02_meta/paginated_articles.xml" target="page"/> + <datasource type="support" mode="full" source="02_meta/meta.xml" target="meta"/> + <datasource type="support" mode="full" source="01_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 511a64f..a941751 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="03_meta/tags.xml" target="tag"/> - <datasource type="support" mode="full" source="03_meta/meta.xml" target="meta"/> + <datasource type="main" mode="iterate" source="02_meta/tags.xml" target="tag"/> + <datasource type="support" mode="full" source="02_meta/meta.xml" target="meta"/> <target mode="xpath" value="concat(xalan:nodeset($datasource)/datasource/tag/entry/@handle, '/index.html')"/> </xsl:variable> |