Changeset 13181

Timestamp:

2006-10-30T13:39:50+13:00 (17 years ago)

Author:

kjdon

Message:

RecPlug option -use_metadata_files has been deprecated. When parsing plugins, instead of ensuring that this option is present, we remove it if it is.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

@@ -1421 +1421 @@
     private Element parsePlugin(String command_str) {
     Element command_element = null;
-    boolean use_metadata_files = false;
+    //boolean use_metadata_files = false;
     try {
         CommandTokenizer tokenizer = new CommandTokenizer(command_str);
@@ -1435 +1435 @@
         HashMap arguments = parseArguments(tokenizer);
         // Assign the arguments as Option elements, but watch out for the metadata argument as we treat that differently
+        // also watch out for the deprecated -use_metadata_files option to RecPlug and remove it
         Iterator names = arguments.keySet().iterator();
         while(names.hasNext()) {
             String name = (String) names.next();
             String value = (String) arguments.get(name); // Can be null
+            
+            if(type.equals(StaticStrings.RECPLUG_STR) && name.substring(1).equals(StaticStrings.USE_METADATA_FILES_ARGUMENT)) {
+            continue; // ignore this option
+            }
             Element option_element = document.createElement(StaticStrings.OPTION_ELEMENT);
-            if(name.substring(1).equals(StaticStrings.USE_METADATA_FILES_ARGUMENT)) {
-            use_metadata_files = true;
-            }
             option_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name.substring(1));
             option_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
@@ -1454 +1456 @@
                 if(value.indexOf(StaticStrings.NS_SEP) == -1) {
                 value = StaticStrings.EXTRACTED_NAMESPACE + value;
-                }
+                }
             }
             XMLTools.setValue(option_element, value);
@@ -1464 +1466 @@
         }
 
-        // We must have some RecPlug options: use_metadata_files
-        if (type.equals(StaticStrings.RECPLUG_STR)) {
-            if (!use_metadata_files) {
-            Element option_element = document.createElement(StaticStrings.OPTION_ELEMENT);
-            option_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, StaticStrings.USE_METADATA_FILES_ARGUMENT);
-            option_element.setAttribute(StaticStrings.ASSIGNED_ATTRIBUTE, StaticStrings.TRUE_STR);
-            command_element.appendChild(option_element);
-            option_element = null;
-            }
-        }
         type = null;
         names = null;