Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/cdm/CollectionConfiguration.java

Timestamp:

2004-10-13T14:48:20+13:00 (20 years ago)

Author:

mdewsnip

Message:

Finally committing the (many) changes to the GLI to use the new metadata code... I hope this doesn't have too many bugs in it and committing it now doesn't stuff anyone up! (Katherine said I could commit it, so blame her if anything goes wrong).

File:

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

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

@@ -36 +36 @@
 import org.greenstone.gatherer.Gatherer;
 import org.greenstone.gatherer.gui.GLIButton;
+import org.greenstone.gatherer.metadata.MetadataElement;
+import org.greenstone.gatherer.metadata.MetadataTools;
 import org.greenstone.gatherer.util.DOMTree;
 import org.greenstone.gatherer.util.Codec;
@@ -538 +540 @@
 
         // Remove the extracted metadata namespaces if required
-        if (!show_extracted_namespace && value_str.length() > 0) {
+        if (value_str.length() > 0) {
             StringTokenizer string_tokenizer = new StringTokenizer(value_str, ",");
             value_str = "";
             while (string_tokenizer.hasMoreElements()) {
             String token = (String) string_tokenizer.nextElement();
+            MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName(token);
+            if (metadata_element != null) {
+                token = metadata_element.getFullName();
+            }
+
             if (token.startsWith(StaticStrings.EXTRACTED_NAMESPACE)) {
                 token = token.substring(StaticStrings.EXTRACTED_NAMESPACE.length());
             }
 
-            if (!value_str.equals("")) {
+            value_str = value_str + token;
+            if (string_tokenizer.hasMoreElements()) {
                 value_str = value_str + ",";
             }
-            value_str = value_str + token;
             }
         }
@@ -1138 +1145 @@
             while (string_tokenizer.hasMoreElements()) {
                 String token = (String) string_tokenizer.nextElement();
+
                 if (token.indexOf(StaticStrings.NS_SEP) == -1) {
                 token = StaticStrings.EXTRACTED_NAMESPACE + token;
+                }
+                else {
+                MetadataElement metadata_element = MetadataTools.getMetadataElementWithName(token);
+                if (metadata_element != null) {
+                    token = metadata_element.getDisplayName();
+                }
                 }
 
@@ -1472 +1486 @@
             }
             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.
+                // 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(StaticStrings.NS_SEP) == -1) {
                 value = StaticStrings.EXTRACTED_NAMESPACE + value;