Changeset 7022

Timestamp:

2004-03-12T10:07:13+13:00 (20 years ago)

Author:

kjdon

Message:

now reads in build options in the right language, and doesn't use the ones saved in config.xml unless the language is the same

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (5 diffs)
• collection/BuildOptions.java (modified) (6 diffs)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -76 +76 @@
 
     static final private String GENERAL_EMAIL_SETTING = "general.email";
+    /** the lang attribute of the other element */
+    static final private String LANGUAGE = "lang";
     /** The name of a Name Element. */
     static final private String NAME = "Name";
@@ -332 +334 @@
     Element argument_element = null;
     try {
-                // Retrieve the other information subtree.
+        // Retrieve the other information subtree.
         Element document_element = general_config.getDocumentElement();
         Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);
@@ -355 +357 @@
     }
     return argument_element;
+    }
+
+    /** Gets the language for the other arguments subtree 
+     @return empty string if no language specified */
+    public String getArgumentsLanguage() {
+    Element document_element = general_config.getDocumentElement();
+    Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);
+    String lang = other_element.getAttribute(LANGUAGE);
+    if (lang == null) {
+        lang = "en";
+    }
+    return lang;
     }
 
@@ -683 +697 @@
         Element document_element = general_config.getDocumentElement();
         Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);
-                // Retrieve the name of the information
+        // Retrieve the name of the information
         Element arguments_name_element = (Element)MSMUtils.getNodeFromNamed(arguments_element, NAME);
         String filename = MSMUtils.getValue(arguments_element);
-                // Find any argument information subtree starting with the same name
+        // Find any argument information subtree starting with the same name
         Element obsolete_arguments_element = getArguments(filename);
-                // Create a copy of the arguments_element within our tree (import).
+        // Create a copy of the arguments_element within our tree (import).
         Element our_arguments_element = (Element) general_config.importNode(arguments_element, true);
-                // Now we insert this new node into the tree. If a previous node exists we replace it instead.
+        // Now we insert this new node into the tree. If a previous node exists we replace it instead.
         if(obsolete_arguments_element == null) {
         other_element.appendChild(our_arguments_element);
@@ -710 +724 @@
     }
 
+    /** Sets the language for the other arguments subtree */
+    public void setArgumentsLanguage(String lang) {
+    Element document_element = general_config.getDocumentElement();
+    Element other_element = (Element) MSMUtils.getNodeFromNamed(document_element, OTHER);
+    other_element.setAttribute(LANGUAGE, lang);
+    }
+
+    
     /** Set the collection configuration. */
     public void setCollectionConfiguration(Document collection_config) {

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

@@ -43 +43 @@
     /** When constructing a BuildOptions object we first try to retrieve the valid arguments from config.xml. If that fails we then try to parse the arguments noticed when calling import.pl -xml and buildcol.pl -xml. If that also fails, we load the default arguments from the xml template library. */
     public BuildOptions(Element build_values_element, Element import_values_element) {
-    // Try to retrieve the arguments for import and build.
-    build_arguments_element = Gatherer.config.getArguments("buildcol.pl");
-    import_arguments_element = Gatherer.config.getArguments("import.pl");
+    // first check the saved arguments language
+    String interface_lang = Gatherer.config.getLanguage();
+    String args_lang = Gatherer.config.getArgumentsLanguage();
+    if (interface_lang.equals(args_lang)) {
+        // Try to retrieve the arguments for import and build.
+        build_arguments_element = Gatherer.config.getArguments("buildcol.pl");
+        import_arguments_element = Gatherer.config.getArguments("import.pl");
+    }
     // If that fails try to reconstruct the arguments
     if(build_arguments_element == null || import_arguments_element == null) {
-        build_arguments_element = loadArguments("buildcol.pl");
-        import_arguments_element = loadArguments("import.pl");
+        boolean used_defaults = false;
+        build_arguments_element = loadArguments("buildcol.pl", interface_lang);
+        import_arguments_element = loadArguments("import.pl", interface_lang);
         // And if that too fails, load the default argument templates
         if(build_arguments_element == null || import_arguments_element == null) {
@@ -58 +64 @@
         import_arguments_element = import_document.getDocumentElement();
         import_document = null;
+        used_defaults = true;
         ///atherer.println("Loaded default BO arguments from templates.");
         }
@@ -64 +71 @@
         }
         // 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 (used_defaults) {
+        Gatherer.config.setArgumentsLanguage("en");
+        } else {
+        Gatherer.config.setArgumentsLanguage(interface_lang);
+        }
         Gatherer.config.setArguments(build_arguments_element);
         Gatherer.config.setArguments(import_arguments_element);
@@ -363 +375 @@
     }
 
-    private Element loadArguments(String filename) {
+    private Element loadArguments(String filename, String lang) {
     Element arguments_element = null;
     // Run the required program.
@@ -369 +381 @@
         String args[];
         if(Utility.isWindows()) {
-        args = new String[4];
+        args = new String[6];
         args[0] = Gatherer.config.perl_path;
         args[1] = "-S";
         args[2] = Gatherer.config.getScriptPath() + filename;
         args[3] = "-xml";
+        args[4] = "-language";
+        args[5] = lang;
         }
         else {
-        args = new String[2];
+        args = new String[4];
         args[0] = Gatherer.config.getScriptPath() + filename;
         args[1] = "-xml";
+        args[2] = "-language";
+        args[3] = lang;
         }
         // Create the process.
@@ -384 +400 @@
         Process process = runtime.exec(args);
         //InputStream input_stream = process.getErrorStream();
-        InputSource source = new InputSource(new InputStreamReader(process.getErrorStream()));
+        InputSource source = new InputSource(new InputStreamReader(process.getErrorStream(), "UTF-8"));
         DOMParser parser = new DOMParser();
         parser.parse(source);