Changeset 25472 for documentation/trunk/tutorials/processing

Timestamp:

2012-04-24T20:30:19+12:00 (12 years ago)

Author:

ak19

Message:

1. ApplyXSLT takes an additional parameter: the Greenstone major version number, or sets this to 2 if none is provided. This is then passed onto the XSLT files. 2. generate-html.sh/bat will pass any commandline parameters on to ApplyXSLT.java. 3. Simplified the generate-html.bat file with a for loop to avoid code duplication. 4. The MajorVersion element will now be processed by processing/common.xsl: anything in a MajorVersion element whose number matches the Greenstone major version number specified to generate-html.sh/bat (or ApplyXSLT.java) will be output to html, if the MajorVersion number does not match, it won't be output.

Location:

documentation/trunk/tutorials/processing

Files:

• common.xsl (modified) (2 diffs)
• xml-to-index.xsl (modified) (1 diff)
• xml-to-many-html.xsl (modified) (1 diff)
• xml-to-one-html.xsl (modified) (1 diff)
• xml-to-one-workshop.xsl (modified) (1 diff)
• xml-to-top-index.xsl (modified) (1 diff)
• xml-to-wiki-index.xsl (modified) (1 diff)
• xml-to-workshop.xsl (modified) (1 diff)

documentation/trunk/tutorials/processing/common.xsl

@@ -5 +5 @@
   exclude-result-prefixes="dict">
 
+  <!--The following strips newlines introduced by elements, in particular introduced around the MajorVersion template match
+      See http://stackoverflow.com/questions/3265244/removing-blank-lines-in-xslt
+      and http://msdn.microsoft.com/en-us/library/ms256107.aspx -->
+  <xsl:strip-space elements="*"/>
+  
   <xsl:variable name="diction" select="dict:new('en')"/>
 
@@ -160 +165 @@
   </xsl:template>
 
+  <!-- Do not process any elements marked with MajorVersion and whose version does not 
+       specifically match the requested greenstone major version (2 or 3) -->
+  <!--To avoid multiple lines of whitespace around output, use 
+     <xsl:for-each select="node()"><xsl:apply-templates/></xsl:for-each>
+     This outputs the contents on its own separate line. 
+     To avoid thinking about unnecessary newlines and to avoid omitting any sub-xml items 
+     that need to be processed, we can instead have the following at the top of the file:
+     <xsl:strip-space elements="*"/> -->
+  <xsl:template match="MajorVersion"> 
+    <xsl:if test="$gs-major-version=@number">
+      <xsl:apply-templates/>      
+    </xsl:if>
+  </xsl:template>
+
   <xsl:template name="SampleFiles">
     <xsl:param name="mode">web</xsl:param>

documentation/trunk/tutorials/processing/xml-to-index.xsl

@@ -4 +4 @@
 
   <xsl:output method="html"/>
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>
 

documentation/trunk/tutorials/processing/xml-to-many-html.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>
 

documentation/trunk/tutorials/processing/xml-to-one-html.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>
   <xsl:output method="html"/>

documentation/trunk/tutorials/processing/xml-to-one-workshop.xsl

@@ -4 +4 @@
   xmlns:xalan="http://xml.apache.org/xalan">
 
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>
 

documentation/trunk/tutorials/processing/xml-to-top-index.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>
 

documentation/trunk/tutorials/processing/xml-to-wiki-index.xsl

@@ -3 +3 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>
 

documentation/trunk/tutorials/processing/xml-to-workshop.xsl

@@ -4 +4 @@
   xmlns:xalan="http://xml.apache.org/xalan">
 
+  <xsl:param name="gs-major-version"/>
   <xsl:include href="common.xsl"/>