Changeset 13748

Timestamp:

2007-01-23T14:28:19+13:00 (17 years ago)

Author:

mdewsnip

Message:

No longer saves the import.pl and buildcol.pl arguments in the GLI config.xml file. This was dodgy with different languages, and the saved options were often out of date. Now the options are simply read when required (similar to the plugin and classifier options).

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/Collection.java (modified) (1 diff)
• collection/ScriptOptions.java (modified) (1 diff)
• gui/ExplodeMetadataDatabasePrompt.java (modified) (1 diff)

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

@@ -107 +107 @@
     }
     // Finally create all of the child managers that are directly dependant on a collection
-    build_options = new ScriptOptions(getBuildValues(), "buildcol.pl", true);
-    import_options = new ScriptOptions(getImportValues(), "import.pl", true);
+    build_options = new ScriptOptions(getBuildValues(), "buildcol.pl");
+    import_options = new ScriptOptions(getImportValues(), "import.pl");
     }
     

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

@@ -41 +41 @@
     /** The name of the 'true' value. */
     static final private String TRUE = "true";
-    /** When constructing a ScriptOptions object we first try to retrieve the valid arguments from config.xml - if saved is true. If that fails we then try to parse the arguments noticed when calling script_name -xml. If that also fails, we try to load the default arguments from the xml template library. */
-    public ScriptOptions(Element values_element, String script_name, boolean saved) {
-    // first check the saved arguments language
-    String interface_lang = Configuration.getLanguage();
-    String args_lang = Configuration.getArgumentsLanguage();
-    if (saved && interface_lang.equals(args_lang)) {
-        // Try to retrieve the arguments for import and build.
-        arguments_element = Configuration.getArguments(script_name);
-    }
-    // If that fails try to reconstruct the arguments
-    if(arguments_element == null) {
-        boolean used_defaults = false;
-        arguments_element = loadArguments(script_name, interface_lang);
-       
-        // And if that too fails, load the default argument templates
-        if(arguments_element == null) {
-        // replace .pl with .xml to get the template name
-        String template_name = script_name.replaceAll("\\.pl$", "\\.xml");
-        Document document = XMLTools.parseXMLFile("xml/" + template_name, true);
-        if (document != null) {
-            arguments_element = document.getDocumentElement();
-            document = null;
-            used_defaults = true;
-
-        } else {
-            return;
-        }
-        ///atherer.println("Loaded default BO arguments from templates.");
-        }
-        else {
-        ///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.
-        if (saved) {
-        if (used_defaults) {
-            Configuration.setArgumentsLanguage("en");
-        } else {
-            Configuration.setArgumentsLanguage(interface_lang);
-        }
-        Configuration.setArguments(arguments_element);
-        }
-    }
-    else {
-        DebugStream.println("Loaded BO arguments from config.xml");
-    }
-    // Now take a note of the values too.
+
+
+    /** Parse the arguments from running "script_name -xml" */
+    public ScriptOptions(Element values_element, String script_name)
+    {
     this.values_element = values_element;
-    }
+    this.arguments_element = loadArguments(script_name, Configuration.getLanguage());
+    }
+
 
     /** Retrieve the indexth argument */

trunk/gli/src/org/greenstone/gatherer/gui/ExplodeMetadataDatabasePrompt.java

@@ -102 +102 @@
     String dom_string = "<Options/>";
     Document doc = XMLTools.parseXML(new StringReader(dom_string));
-    options = new ScriptOptions(doc.getDocumentElement(), "explode_metadata_database.pl", false);
+    options = new ScriptOptions(doc.getDocumentElement(), "explode_metadata_database.pl");
     
     // Creation