Changeset 25471

Timestamp:

2012-04-24T20:29:50+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.

File:

• documentation/trunk/shared/ApplyXSLT.java (modified) (3 diffs)

documentation/trunk/shared/ApplyXSLT.java

@@ -47 +47 @@
     {
     if (args.length < 3) {
-        System.err.println("Usage: ApplyXSLT <Target_language_code> <XSLfile> <XMLfile>");
+        System.err.println("Usage: ApplyXSLT <Target_language_code> <XSLfile> <XMLfile> [greenstone-major-version-number]");
         System.exit(1);
     }   
 
+    String major_version = "2"; // defaults to Greenstone 2
+
     System.setProperty("javax.xml.transform.TransformerFactory",
                "org.apache.xalan.processor.TransformerFactoryImpl");
-    if (args.length == 4){
-        System.setProperty("GSDLHOME",args[3]);
+    if (args.length >= 4){
+        for(int i = 3; i < args.length; i++) { // 4 to 5 args
+        if(args[i].length() > 1) {
+            System.setProperty("GSDLHOME",args[i]);
+        } else { // number of chars is 1, assume it's the Greenstone version (2 or 3)
+            major_version = args[i];
+        }
+        }
     }
 
@@ -69 +77 @@
     String stylesheet = args[1];
     String xml_in = args[2];
+    //String major_version = (args.length >= 5) ? args[4] : "2"; 
+    //System.err.println("**** Greenstone version requested: " + major_version);
+
     try {
         // Use the TransformerFactory to process the stylesheet Source and generate a Transformer
@@ -78 +89 @@
 
         transformer.setParameter("lang", lang);
+        transformer.setParameter("gs-major-version", major_version);
         transformer.transform(input, new StreamResult(output));
     }