Changeset 8313 for trunk/gli/src/org/greenstone/gatherer/cdm/Argument.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/Argument.java (modified) (3 diffs)

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

@@ -39 +39 @@
 import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.collection.CollectionManager;
-import org.greenstone.gatherer.msm.ElementWrapper;
+import org.greenstone.gatherer.metadata.MetadataElement;
+import org.greenstone.gatherer.metadata.MetadataTools;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -246 +247 @@
      * @see org.greenstone.gatherer.collection.CollectionManager#getCollection
      */
-    public String getValue() {
-    String value = null;
-    // Only assigned arguments have values. 
-    if(element != null) {
-        value = XMLTools.getValue(element);
-        // We may have to retrieve the language dependant string for a metadata element
-        if(type == METADATUM) {
-        ElementWrapper element_wrapper = Gatherer.c_man.getCollection().msm.getElement(value);
-        if(element_wrapper != null) {
-            value = element_wrapper.getName();
-        }
-        }
-    }
-    return value;
-    }
-
-    /** Retrieve the vector of values.
-     * @return an ArrayList of values
-     * @see org.greenstone.gatherer.Gatherer#c_man
-     * @see org.greenstone.gatherer.collection.CollectionManager#getCollection
-     */
-    public ArrayList getValues() {
-    ArrayList values = new ArrayList();
-    // Only assigned arguments have values. 
-    if(element != null) {
-        String value = XMLTools.getValue(element);
-        StringTokenizer tokenizer = new StringTokenizer(value, ",");
-        while(tokenizer.hasMoreTokens()) {
-        String token = tokenizer.nextToken();
-        if(type == METADATA) {
-            ElementWrapper element_wrapper = Gatherer.c_man.getCollection().msm.getElement(token);
-            if(element_wrapper != null) {
-            token = element_wrapper.toString();
-            }
-        }
-        values.add(token);
-        }
-    }
-    return values;
-    }
+    public String getValue()
+    {
+    // Only assigned arguments have values.
+    if (element == null) {
+        return null;
+    }
+
+    return XMLTools.getValue(element);
+    }
+
 
     /** Method to determine if this argument has been assigned.
@@ -509 +480 @@
      * @see org.greenstone.gatherer.util.StaticStrings#SPEECH_CHARACTER
      */
-    public String toString() {
+    public String toString()
+    {
     StringBuffer text = new StringBuffer("-");
-    if(element != null) {
-        if(name == null) {
-        name = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
-        }
-        text.append(name);
-        String value = XMLTools.getValue(element);
-        if(value.length() > 0) {
-        text.append(StaticStrings.SPACE_CHARACTER);
-        // If the value contains a space, add speech marks
-        if(value.indexOf(StaticStrings.SPACE_CHARACTER) != -1) {
-            value = StaticStrings.SPEECH_CHARACTER + value + StaticStrings.SPEECH_CHARACTER;
-        }
-        // Tokenize the string
-        StringTokenizer tokenizer = new StringTokenizer(value, ",");
-        while(tokenizer.hasMoreTokens()) {
-            String token = tokenizer.nextToken();
-            if(type == METADATA || type == METADATUM) {
-            ElementWrapper element_wrapper = null;
-            // if you click on exit before saving and format statements have changed, this could be null
-            if (Gatherer.c_man.getCollection() != null) {
-                element_wrapper = Gatherer.c_man.getCollection().msm.getElement(token);
-            }
-            if(element_wrapper != null) {
-                text.append(element_wrapper.toString());
-                element_wrapper = null;
-            }
-            else {
-                text.append(token);
-            }
-            }
-            else {
-            text.append(token);
-            }
-            token = null;
-            text.append(StaticStrings.COMMA_CHARACTER);
-        }
-        tokenizer = null;
-        text.deleteCharAt(text.length() - 1);
-        }
-        value = null;
-    }
+
+    if (element == null) {
+        return text.toString();
+    }
+
+    if (name == null) {
+        name = element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
+    }
+    text.append(name);
+
+    String value = XMLTools.getValue(element);
+    if (value.length() == 0) {
+        return text.toString();
+    }
+
+    text.append(StaticStrings.SPACE_CHARACTER);
+
+//  // Handle metadata elements specially
+//  if (type == METADATA || type == METADATUM) {
+//      // Tokenize the string
+//      StringTokenizer tokenizer = new StringTokenizer(value, ",");
+//      while (tokenizer.hasMoreTokens()) {
+//      String token = tokenizer.nextToken();
+
+//      MetadataElement metadata_element = MetadataTools.getMetadataElementWithDisplayName(token);
+//      if (metadata_element != null) {
+//          text.append(metadata_element.getFullName());
+//      }
+//      else {
+//          text.append(token);
+//      }
+
+//      if (tokenizer.hasMoreTokens()) {
+//          text.append(StaticStrings.COMMA_CHARACTER);
+//      }
+//      }
+//      return text.toString();
+//  }
+
+    // If the value contains a space, add speech marks
+    //   (Except for metadata elements, which won't have spaces when written out to collect.cfg)
+    if (value.indexOf(StaticStrings.SPACE_CHARACTER) != -1 && !(type == METADATUM || type == METADATA)) {
+        value = StaticStrings.SPEECH_CHARACTER + value + StaticStrings.SPEECH_CHARACTER;
+    }
+
+    text.append(value);
     return text.toString();
     }