From 6150e834e72000dfd4005789d3a1ef9b542802f1 Mon Sep 17 00:00:00 2001 From: Adrian Kummerlaender Date: Wed, 3 Sep 2014 21:11:52 +0200 Subject: 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 --- source/01_data/articles.xsl | 92 ++++++++++++++++++++++++++++++++++ source/01_data/pages.xsl | 36 +++++++++++++ source/01_data/tags.xsl | 26 ++++++++++ source/01_files/source.xsl | 50 ------------------ source/02_data/articles.xsl | 92 ---------------------------------- source/02_data/pages.xsl | 36 ------------- source/02_data/tags.xsl | 26 ---------- source/02_meta/articles.xsl | 41 +++++++++++++++ source/02_meta/categories.xsl | 45 +++++++++++++++++ source/02_meta/meta.xsl | 29 +++++++++++ source/02_meta/paginated_articles.xsl | 26 ++++++++++ source/02_meta/tags.xsl | 42 ++++++++++++++++ source/03_meta/articles.xsl | 41 --------------- source/03_meta/categories.xsl | 45 ----------------- source/03_meta/meta.xsl | 29 ----------- source/03_meta/paginated_articles.xsl | 26 ---------- source/03_meta/tags.xsl | 42 ---------------- source/99_result/archive.xsl | 4 +- source/99_result/article/article.xsl | 4 +- source/99_result/atom.xsl | 4 +- source/99_result/category/category.xsl | 4 +- source/99_result/page/page.xsl | 4 +- source/99_result/stream.xsl | 6 +-- source/99_result/tag/tag.xsl | 4 +- 24 files changed, 352 insertions(+), 402 deletions(-) create mode 100644 source/01_data/articles.xsl create mode 100644 source/01_data/pages.xsl create mode 100644 source/01_data/tags.xsl delete mode 100644 source/01_files/source.xsl delete mode 100644 source/02_data/articles.xsl delete mode 100644 source/02_data/pages.xsl delete mode 100644 source/02_data/tags.xsl create mode 100644 source/02_meta/articles.xsl create mode 100644 source/02_meta/categories.xsl create mode 100644 source/02_meta/meta.xsl create mode 100644 source/02_meta/paginated_articles.xsl create mode 100644 source/02_meta/tags.xsl delete mode 100644 source/03_meta/articles.xsl delete mode 100644 source/03_meta/categories.xsl delete mode 100644 source/03_meta/meta.xsl delete mode 100644 source/03_meta/paginated_articles.xsl delete mode 100644 source/03_meta/tags.xsl (limited to 'source') diff --git a/source/01_data/articles.xsl b/source/01_data/articles.xsl new file mode 100644 index 0000000..8e65f40 --- /dev/null +++ b/source/01_data/articles.xsl @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + highlight --out-format=xhtml --inline-css --style=molokai --fragment --enclose-pre --wrap-simple --syntax= + + + + + + txt + + + + + + + +
+		
+	
+
+ + + + + + + + + + + + + + + + + + + kramdown + + + + + + + <xsl:value-of select="xalan:nodeset($content)/h1"/> + + + + + + + + + + + + + + + + + + + + +
diff --git a/source/01_data/pages.xsl b/source/01_data/pages.xsl new file mode 100644 index 0000000..cdfa6d4 --- /dev/null +++ b/source/01_data/pages.xsl @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + kramdown + + + + + + + <xsl:value-of select="xalan:nodeset($content)/h1"/> + + + + + + + + diff --git a/source/01_data/tags.xsl b/source/01_data/tags.xsl new file mode 100644 index 0000000..bfd227b --- /dev/null +++ b/source/01_data/tags.xsl @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/source/01_files/source.xsl b/source/01_files/source.xsl deleted file mode 100644 index 1648c73..0000000 --- a/source/01_files/source.xsl +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [source/00_content] - - - - diff --git a/source/02_data/articles.xsl b/source/02_data/articles.xsl deleted file mode 100644 index 3a71cc2..0000000 --- a/source/02_data/articles.xsl +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - highlight --out-format=xhtml --inline-css --style=molokai --fragment --enclose-pre --wrap-simple --syntax= - - - - - - txt - - - - - - - -
-		
-	
-
- - - - - - - - - - - - - - - - - - - kramdown - - - - - - - <xsl:value-of select="xalan:nodeset($content)/h1"/> - - - - - - - - - - - - - - - - - - - - -
diff --git a/source/02_data/pages.xsl b/source/02_data/pages.xsl deleted file mode 100644 index 2123dae..0000000 --- a/source/02_data/pages.xsl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - kramdown - - - - - - - <xsl:value-of select="xalan:nodeset($content)/h1"/> - - - - - - - - diff --git a/source/02_data/tags.xsl b/source/02_data/tags.xsl deleted file mode 100644 index b615213..0000000 --- a/source/02_data/tags.xsl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
- - - diff --git a/source/02_meta/articles.xsl b/source/02_meta/articles.xsl new file mode 100644 index 0000000..1a8b8fa --- /dev/null +++ b/source/02_meta/articles.xsl @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + <xsl:value-of select="title"/> + + + + +
+
+
+ +
diff --git a/source/02_meta/categories.xsl b/source/02_meta/categories.xsl new file mode 100644 index 0000000..c0075b0 --- /dev/null +++ b/source/02_meta/categories.xsl @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + <xsl:value-of select="$page/title"/> + + + + + + + + + + + + + + + + + + + + diff --git a/source/02_meta/meta.xsl b/source/02_meta/meta.xsl new file mode 100644 index 0000000..f0c48d7 --- /dev/null +++ b/source/02_meta/meta.xsl @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/source/02_meta/paginated_articles.xsl b/source/02_meta/paginated_articles.xsl new file mode 100644 index 0000000..9fb38a9 --- /dev/null +++ b/source/02_meta/paginated_articles.xsl @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + +
+ + + diff --git a/source/02_meta/tags.xsl b/source/02_meta/tags.xsl new file mode 100644 index 0000000..20b1f10 --- /dev/null +++ b/source/02_meta/tags.xsl @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + <xsl:value-of select="$article/self::title"/> + + + + + + + + + + + + + +
+ + + +
+
+ +
diff --git a/source/03_meta/articles.xsl b/source/03_meta/articles.xsl deleted file mode 100644 index 8babed3..0000000 --- a/source/03_meta/articles.xsl +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - <xsl:value-of select="title"/> - - - - -
-
-
- -
diff --git a/source/03_meta/categories.xsl b/source/03_meta/categories.xsl deleted file mode 100644 index f1c2f5e..0000000 --- a/source/03_meta/categories.xsl +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - <xsl:value-of select="$page/title"/> - - - - - - - - - - - - - - - - - - - - diff --git a/source/03_meta/meta.xsl b/source/03_meta/meta.xsl deleted file mode 100644 index 2af78de..0000000 --- a/source/03_meta/meta.xsl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/source/03_meta/paginated_articles.xsl b/source/03_meta/paginated_articles.xsl deleted file mode 100644 index e00ee51..0000000 --- a/source/03_meta/paginated_articles.xsl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - -
- - - diff --git a/source/03_meta/tags.xsl b/source/03_meta/tags.xsl deleted file mode 100644 index 9e399cd..0000000 --- a/source/03_meta/tags.xsl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - <xsl:value-of select="$article/self::title"/> - - - - - - - - - - - - - -
- - - -
-
- -
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 @@ - - + + 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 @@ - - + + 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 @@ /> - - + + 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 @@ - - + + 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 @@ - - + + 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 @@ - - - + + + 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 @@ - - + + -- cgit v1.2.3