Changeset 17801 for gli/trunk/src/org/greenstone/gatherer/Configuration.java

Timestamp:

2008-11-10T12:53:46+13:00 (15 years ago)

Author:

kjdon

Message:

never copy over library_url_gs2/3 or open_collection_gs2/3 when updating the gli config file as it may be wrong. affects the case when you are running several greenstone installations

File:

• gli/trunk/src/org/greenstone/gatherer/Configuration.java (modified) (1 diff)

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

@@ -287 +287 @@
         // Argument found
         if (old_argument_element_name.equals(new_argument_element_name)) {
-            if (!new_argument_element_name.equals("general.open_collection"+Configuration.gliPropertyNameSuffix())) {
-            String old_argument_element_value = XMLTools.getElementTextValue(old_argument_element);
-            if (!old_argument_element_value.equals(new_argument_element_value)) {
-                XMLTools.setElementTextValue(new_argument_element, old_argument_element_value);
-            }
+          // we don't want to carry over open_collection or library_url
+          // as these may be invalid
+          if (!new_argument_element_name.equals("general.open_collection"+Configuration.gliPropertyNameSuffix()) && !new_argument_element_name.equals("general.library_url"+Configuration.gliPropertyNameSuffix())) {
+            
+            String old_argument_element_value = XMLTools.getElementTextValue(old_argument_element);
+            if (!old_argument_element_value.equals(new_argument_element_value)) {
+              XMLTools.setElementTextValue(new_argument_element, old_argument_element_value);
             }
-
-            // We don't care about this option any more
+          }
+          
+          // We don't care about this option any more
             old_argument_element.getParentNode().removeChild(old_argument_element);
             break;