Changeset 7546

Timestamp:

2004-06-03T12:23:06+12:00 (20 years ago)

Author:

mdewsnip

Message:

Classifier -metadata elements from the extracted metadata set are now namespaced and un-namespaced correctly when there are multiple elements specified.

File:

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

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

@@ -516 +516 @@
     /** ************************** Private Methods ***************************/
 
-    private String classifyToString(Element command_element, boolean show_extracted_namespace) {
+    private String classifyToString(Element command_element, boolean show_extracted_namespace)
+    {
     StringBuffer text = new StringBuffer(CLASSIFY_STR);
     text.append(TAB_CHARACTER);
@@ -529 +530 @@
         text.append(option_element.getAttribute(NAME_ATTRIBUTE));
         String value_str = MSMUtils.getValue(option_element);
-        if(value_str.length() > 0) {
-            // If the value happens to be the identifier of an extracted metadata element, then remove the namespace.
-            if(!show_extracted_namespace && value_str.startsWith(EXTRACTED_PREFIX)) {
-            value_str = value_str.substring(EXTRACTED_PREFIX.length());
-            }
-            text.append(SPACE_CHARACTER);
-            if(value_str.indexOf(SPACE_CHARACTER) == -1) {
-            text.append(value_str);
-            }
-            else {
-            text.append(SPEECH_CHARACTER);
-            text.append(value_str);
-            text.append(SPEECH_CHARACTER);
-            }
+
+        // Remove the extracted metadata namespaces if required
+        if (!show_extracted_namespace && value_str.length() > 0) {
+            StringTokenizer string_tokenizer = new StringTokenizer(value_str, ",");
+            value_str = "";
+            while (string_tokenizer.hasMoreElements()) {
+            String token = (String) string_tokenizer.nextElement();
+            if (token.startsWith(EXTRACTED_PREFIX)) {
+                token = token.substring(EXTRACTED_PREFIX.length());
+            }
+
+            if (!value_str.equals("")) {
+                value_str = value_str + ",";
+            }
+            value_str = value_str + token;
+            }
+        }
+
+        text.append(SPACE_CHARACTER);
+        if (value_str.indexOf(SPACE_CHARACTER) == -1) {
+            text.append(value_str);
+        }
+        else {
+            text.append(SPEECH_CHARACTER);
+            text.append(value_str);
+            text.append(SPEECH_CHARACTER);
         }
         value_str = null;
@@ -844 +857 @@
         InputStream istream = new FileInputStream(collect_config_file);
         Reader in_reader = new InputStreamReader(istream, ENCODING);
-        //FileReader in_reader = new FileReader(collect_config_file);
         BufferedReader in = new BufferedReader(in_reader);
         String command_str = null;
@@ -1112 +1124 @@
             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);
+            if (name.equals(METADATA_ARGUMENT) && value != null) {
+            // Add the extracted namespace onto un-namespaced metadata names
+            StringTokenizer string_tokenizer = new StringTokenizer(value, ",");
+            value = "";
+            while (string_tokenizer.hasMoreElements()) {
+                String token = (String) string_tokenizer.nextElement();
+                if (token.indexOf(MSMUtils.NS_SEP) == -1) {
+                token = EXTRACTED_PREFIX + token;
+                }
+
+                if (!value.equals("")) {
+                value = value + ",";
+                }
+                value = value + token;
+            }
             }
             // Everything else is an Option Element