Changeset 5208

Timestamp:

2003-08-19T15:37:16+12:00 (21 years ago)

Author:

jmt12

Message:

Fix 203B150

File:

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

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

@@ -906 +906 @@
             String name = (String) names.next();
             String value = (String) arguments.get(name); // Can be null
-            // The metadata argument gets added as the content attribute
-            if(name.equals(METADATA_ARGUMENT) && value != null) {
-            // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.
-            if(value.indexOf(MSMUtils.NS_SEP) == -1) {
-                value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
-            }
-            //command_element.setAttribute(CONTENT_ATTRIBUTE, value);
-            }
             // Everything else is an Option Element
             Element option_element = document.createElement(OPTION_ELEMENT);
             option_element.setAttribute(NAME_ATTRIBUTE, name.substring(1));
             if(value != null) {
+            // Remove any speech marks appended in strings containing whitespace
+            if(value.startsWith(QUOTE_CHARACTER) && value.endsWith(QUOTE_CHARACTER)) {
+                value = value.substring(1, value.length() - 1);
+            }
+            // The metadata argument gets added as the content attribute
+            if(name.equals(METADATA_ARGUMENT) && value != null) {
+                // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.
+                if(value.indexOf(MSMUtils.NS_SEP) == -1) {
+                value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
+                }
+                //command_element.setAttribute(CONTENT_ATTRIBUTE, value);
+            }
             MSMUtils.setValue(option_element, value);
             }
@@ -1172 +1176 @@
             command_element = document.createElement(COLLECTIONMETADATA_PUBLIC_ELEMENT);
         }
-        if(command_element != null) {
+        if(command_element != null && value_str != null) {
             command_element.setAttribute(NAME_ATTRIBUTE, name_str);
             command_element.setAttribute(LANGUAGE_ATTRIBUTE, ENGLISH_LANGUAGE_STR);
             command_element.setAttribute(SPECIAL_ATTRIBUTE, TRUE_STR);
+            if(value_str.startsWith(QUOTE_CHARACTER) && value_str.endsWith(QUOTE_CHARACTER)) {
+            value_str = value_str.substring(1, value_str.length() - 1);
+            }
             MSMUtils.setValue(command_element, value_str);
         }
@@ -1216 +1223 @@
             option_element.setAttribute(CUSTOM_ATTRIBUTE, TRUE_STR); // All arguments are considered to be custom until matched against base plugins arguments
             if(value != null) {
+            // Remove any speech marks appended in strings containing whitespace
+            if(value.startsWith(QUOTE_CHARACTER) && value.endsWith(QUOTE_CHARACTER)) {
+                value = value.substring(1, value.length() - 1);
+            }
             if(name.equals(METADATA_ARGUMENT)) {
                 // The metadata argument must be the fully qualified name of a metadata element, so if it doesn't yet have a namespace, append the extracted metadata namespace.