Changeset 20007 for gli

Timestamp:

2009-07-17T18:59:12+12:00 (15 years ago)

Author:

ak19

Message:

Adjusted the code to deal with 1. semicolons and commas separating metadata fieldnames, 2. Greenstone extracted metadata fieldnames being referred to with the ex. prefix.

File:

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

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

@@ -1546 +1546 @@
     
     // final true arg to return delims as tokens
-    StringTokenizer string_tokenizer = new StringTokenizer (value_str, ",", true);
+    StringTokenizer string_tokenizer = new StringTokenizer (value_str, ",;", true);
     StringBuffer value_buffer = new StringBuffer ();
     while (string_tokenizer.hasMoreElements ()) {
@@ -1553 +1553 @@
       boolean modified_token = false;
       // not a delimiter token
-      if (!raw_token.equals(",")) {
+      if (!raw_token.equals(",") && !raw_token.equals(";")) {
     MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName (token);
     if (metadata_element != null) {
@@ -2179 +2179 @@
                 if (!value_str.equals ("") && name_str.equals (StaticStrings.METADATA_STR)) {
                     // 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.
-                    String[] values = value_str.split (StaticStrings.COMMA_CHARACTER);
-                    value_str = "";
+            String[] values = value_str.split (StaticStrings.COMMA_CHARACTER);
+            value_str = "";
                     for (int k=0; k<=values.length-1; k++) {
                         if (values[k].indexOf (StaticStrings.NS_SEP) == -1) {
@@ -2762 +2762 @@
                     
                     // The metadata argument is the fully qualified name of a metadata element, so if it contains a namespace, remove the extracted metadata namespace as the build process doesn't know about it.
-                    String[] values = value_str.split (StaticStrings.COMMA_CHARACTER);
-                    value_str = "";
+            String[] values = value_str.split (StaticStrings.COMMA_CHARACTER);
+            value_str = "";
                     for (int k=0; k<=values.length-1; k++) {
                         if(values[k].startsWith (StaticStrings.EXTRACTED_NAMESPACE)) {