Changeset 20439 for gli

Timestamp:

2009-08-30T18:41:00+12:00 (15 years ago)

Author:

kjdon

Message:

Argument now controls the conversion between metadata display name and proper name for arguments. The underlying XML holds the proper name eg dc.Subject, while the toString and getValue methods show the display name eg dc.Subject and Keywords

File:

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

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

@@ -103 +103 @@
   /** The argument flag as it appears in the command. Also used as the unique identifier of an argument. */
   private String name = null;
+    /** The value of the arg, stored for metadata type options */
+    private String stored_value = null;
   /** The plugin that owns this argument, for the purposes of visualising inheritance. */
   private String owner = null;
@@ -264 +266 @@
       return null;
     }
-
-    return XMLTools.getValue(element);
+    if (stored_value != null) {
+    return stored_value;
+    }
+    String value = XMLTools.getValue(element);
+    if (type == METADATA) {
+    // We display using metadata display name, but store in the XML using
+    // full name (canonical name)
+    stored_value = MetadataTools.convertMetadataElementListNames(value, MetadataTools.TO_DISPLAY_NAMES);
+    return stored_value;
+    }
+    return value; 
   }
 
@@ -451 +462 @@
   public void setValue(String value) {
     if(element != null) {
-      XMLTools.setValue(element, value);
+    if (type == METADATA) {
+        value = MetadataTools.convertMetadataElementListNames(value, MetadataTools.FROM_DISPLAY_NAMES);
+        stored_value = value;
+    }
+    XMLTools.setValue(element, value);
     }
     else {
@@ -500 +515 @@
     text.append(name);
 
-    String value = XMLTools.getValue(element);
+    String value = getValue(); //XMLTools.getValue(element);
     if (value.length() == 0) {
       return text.toString();