Changeset 6087 for trunk/gli/src/org/greenstone/gatherer/collection

Timestamp:

2003-12-02T17:18:37+13:00 (20 years ago)

Author:

jmt12

Message:

Extended arguments so they could be given a minimum and maximum range. Then if they are INTEGER type controls, the spinner control generated will honour any range information. Range information is supplied via the perl -xml type mechanism, using the tag form <Range>0,3</Range>

File:

• trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/BuildOptions.java

@@ -9 +9 @@
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.ArrayTools;
+import org.greenstone.gatherer.util.Codec;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
@@ -48 +50 @@
         build_arguments_element = loadArguments("buildcol.pl");
         import_arguments_element = loadArguments("import.pl");
-                // And if that too fails, load the default argument templates
+        // And if that too fails, load the default argument templates
         if(build_arguments_element == null || import_arguments_element == null) {
         Document build_document = Utility.parse("xml/buildcol.xml", true);
@@ -61 +63 @@
         ///atherer.println("Loaded BO arguments from scripts.");
         }
-                // By now we should definately have the arguments. However the reason we are here is because they are not stored in the config.xml file, to make sure they are stored now.
+        // By now we should definately have the arguments. However the reason we are here is because they are not stored in the config.xml file, to make sure they are stored now.
         Gatherer.config.setArguments(build_arguments_element);
         Gatherer.config.setArguments(import_arguments_element);
@@ -248 +250 @@
             }
             }
+            else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) {
+            String range_raw = MSMUtils.getValue(node);
+            int comma_index = -1;
+            if((comma_index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) {
+                if(comma_index > 0) {
+                try {
+                    String first_number = range_raw.substring(0, comma_index);
+                    argument.setMinimum(Integer.parseInt(first_number));
+                    first_number = null;
+                }
+                catch(Exception exception) {
+                }
+                }
+                
+                if(comma_index + 1 < range_raw.length()) {
+                try {
+                    String second_number = range_raw.substring(comma_index + 1);
+                    argument.setMaximum(Integer.parseInt(second_number));
+                    second_number = null;    
+                }
+                catch(Exception exception) {
+                }
+                }
+            }
+            // Else it wasn't a valid range anyway, so ignore it
+            range_raw = null;
+            }
         }
         }
@@ -299 +328 @@
             values.add("-" + argument_element.getAttribute(NAME));
             // Now retrieve the value.
-            String argument_value = MSMUtils.getValue(argument_element);
+            String argument_value = Codec.transform(MSMUtils.getValue(argument_element), Codec.DOM_TO_TEXT);
             // If there is a value, tokenize it by commas only.
             if(argument_value != null && argument_value.length() > 0) {
@@ -319 +348 @@
     Element arguments_element = null;
     // Run the required program.
-    /** @todo - I never finished implementing this. Have to test that the perl script handles being loaded in this way.
-        try {
-        String args[] = new String[3];
-        args[0] = Gatherer.config.perl_path;
-        args[1] = filename;
-        args[2] = "-xml";
-                // Create the process.
-                Runtime runtime = Runtime.getRuntime();
-                Process process = runtime.exec(args);
-                //InputStream input_stream = process.getErrorStream();
-                InputSource source = new InputSource(new InputStreamReader(process.getErrorStream()));
-                DOMParser parser = new DOMParser();
-                parser.parse(source);
-                Document document = parser.getDocument();
-                arguments_element = document.getDocumentElement();
-                }
-                catch (Exception error) {
-                Gatherer.println("Error in BuildOptions.loadArguments(): " + error);
-                Gatherer.printStackTrace(error);
-                }
-    */
+    try {
+        String args[];
+        if(Utility.isWindows()) {
+        args = new String[4];
+        args[0] = Gatherer.config.perl_path;
+        args[1] = "-S";
+        args[2] = Gatherer.config.getScriptPath() + filename;
+        args[3] = "-xml";
+        }
+        else {
+        args = new String[2];
+        args[0] = Gatherer.config.getScriptPath() + filename;
+        args[1] = "-xml";
+        }
+        // Create the process.
+        Runtime runtime = Runtime.getRuntime();
+        Process process = runtime.exec(args);
+        //InputStream input_stream = process.getErrorStream();
+        InputSource source = new InputSource(new InputStreamReader(process.getErrorStream()));
+        DOMParser parser = new DOMParser();
+        parser.parse(source);
+        Document document = parser.getDocument();
+        arguments_element = document.getDocumentElement();
+    }
+    catch (Exception error) {
+        Gatherer.println("Error in BuildOptions.loadArguments(): " + error);
+        Gatherer.printStackTrace(error);
+    }
     return arguments_element;
     }