Changeset 4838

Timestamp:

2003-07-01T11:51:47+12:00 (21 years ago)

Author:

jmt12

Message:

2030159: Had confused element name and identifier. Also added ability for ElementWrappers to be stored as Argument values, and thus have identifier appear within GLI while the name is written to the collect.cfg

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• Argument.java (modified) (8 diffs)
• ArgumentConfiguration.java (modified) (2 diffs)
• ClassifierManager.java (modified) (2 diffs)
• PlugInManager.java (modified) (2 diffs)

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

@@ -54 +54 @@
 import java.util.Iterator;
 import java.util.HashMap;
+import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.Utility;
@@ -78 +79 @@
     /** The type of this argument. Initially an int, but bytes are cheaper. */
     private byte type = FLAG;
+
+    private ElementWrapper element = null;
     /** If the argument is of type ENUM then this map holds all the various options. Each entry is an <option value> -> <description> mapping. */
     private HashMap list = null;
@@ -229 +232 @@
       */
     public String getValue() {
+    if(element != null) {
+        return element.toString();
+    }
     return value;
     }
@@ -272 +278 @@
     desc = new_desc;
     }
+
+    public void setElementValue(ElementWrapper element) {
+    this.element = element;
+    }
+
     /** Set the value of name.
       * @param new_name The new value of name as a <strong>String</strong>.
@@ -341 +352 @@
     }
     }
+
     /** Method to set the value of value.
       * @param new_value The new value of value as a <strong>String</strong>.
@@ -360 +372 @@
     case FLAG:
         return "-" + name;
+    case METADATA:
+        StringBuffer metadata_text = new StringBuffer("-");
+        metadata_text.append(name);
+        metadata_text.append(" ");
+        if(element != null) {
+        String element_name = element.toString();
+        if(element_name.indexOf(" ") != -1) {
+            metadata_text.append("\"");
+            metadata_text.append(element_name);
+            metadata_text.append("\"");
+        }
+        else {
+            metadata_text.append(element_name);
+        }
+        element_name = null;
+        }
+        else {
+        metadata_text.append(value);
+        }
+        return metadata_text.toString();
     case METADATUM:
-        StringBuffer text = new StringBuffer("-");
-        text.append(name);
-        text.append(" ");
+        StringBuffer metadatum_text = new StringBuffer("-");
+        metadatum_text.append(name);
+        metadatum_text.append(" ");
         for(int i = 0; i < values.size(); i++) {
-        text.append(values.get(i).toString());
+        metadatum_text.append(values.get(i).toString());
         if(i < values.size() - 1) {
-            text.append(",");
-        }
-        }
-        return text.toString();
+            metadatum_text.append(",");
+        }
+        }
+        return metadatum_text.toString();
     case STRING:
         // we need to put quotes if they are not there
@@ -385 +417 @@
     switch(type) {
     case METADATA:
-        if (value != null) {
-        String temp_value = value;
-        
-        if (temp_value.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE+MSMUtils.NS_SEP)) {
+        StringBuffer metadata_text = new StringBuffer("-");
+        metadata_text.append(name);
+        if(element != null) {
+        metadata_text.append(" ");
+        String element_name = element.getName();
+        if (element_name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE+MSMUtils.NS_SEP)) {
             
-            temp_value = temp_value.substring(temp_value.indexOf(MSMUtils.NS_SEP)+1);
-        }
-        return "-" + name + " " + temp_value;
-        }
-        return "-" + name;
+            element_name = element_name.substring(element_name.indexOf(MSMUtils.NS_SEP)+1);
+        }
+        metadata_text.append(element_name);
+        element_name = null;
+        }
+        else if(value != null) {
+        metadata_text.append(" ");
+        metadata_text.append(value);
+        }
+        return metadata_text.toString();
     case METADATUM:
-        StringBuffer text = new StringBuffer("-");
-        text.append(name);
-        text.append(" ");
+        StringBuffer metadatum_text = new StringBuffer("-");
+        metadatum_text.append(name);
+        metadatum_text.append(" ");
         for(int i = 0; i < values.size(); i++) {
         String temp_value = values.get(i).toString();
@@ -405 +444 @@
             temp_value = temp_value.substring(temp_value.indexOf(MSMUtils.NS_SEP)+1);
         }
-        text.append(temp_value);
+        metadatum_text.append(temp_value);
         if(i < values.size() - 1) {
-            text.append(",");
-        }
-        }
-        return text.toString();
+            metadatum_text.append(",");
+        }
+        }
+        return metadatum_text.toString();
     default:
         return toString();

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

@@ -651 +651 @@
             return true;
         case Argument.METADATA:
+            // I feel like a cast-away
+            argument.setElementValue((ElementWrapper)((JComboBox)value).getSelectedItem());
+            return true;
         case Argument.HIERARCHY:
             argument.setValue(((JComboBox)value).getSelectedItem().toString());
@@ -740 +743 @@
         this.target = target;
         }
-                /** When the add button is clicked, we attempt to add the selected metadata from the source into the target.
-                 * @param event An <strong>ActionEvent</strong> containing information about the event.
-                 * @see org.greenstone.gatherer.msm.ElementWrapper
-                 */
+        /** When the add button is clicked, we attempt to add the selected metadata from the source into the target.
+         * @param event An <strong>ActionEvent</strong> containing information about the event.
+         * @see org.greenstone.gatherer.msm.ElementWrapper
+         */
         public void actionPerformed(ActionEvent event) {
         ElementWrapper element = (ElementWrapper) source.getSelectedItem();
-        String name = element.toString();
+        String name = element.getName();
         if(!model.contains(name)) {
             boolean found = false;

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

@@ -82 +82 @@
 import org.greenstone.gatherer.cdm.DynamicListModel;
 import org.greenstone.gatherer.file.FileNode;
+import org.greenstone.gatherer.msm.ElementWrapper;
 import org.greenstone.gatherer.msm.MSMEvent;
 import org.greenstone.gatherer.msm.MSMListener;
@@ -381 +382 @@
                 if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
                 String value = tokenizer.nextToken();
-                // special hack for metadata
+                ElementWrapper element = null;
+                // special check for metadata
                 if (argument.getType() == Argument.METADATA) {
                     value = value.replace(':', MSMUtils.NS_SEP);
                     if (value.indexOf(MSMUtils.NS_SEP)==-1){
-                    value = Utility.EXTRACTED_METADATA_NAMESPACE +MSMUtils.NS_SEP+value;
+                    value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
                     }
+                    // Now retrieve the element this refers to, if available.
+                    element = Gatherer.c_man.getCollection().msm.getElement(value);
                 }
-                // shoudl probably do the same for METADATUM
-                
-                argument.setValue(value);
+                if(element != null) {
+                    argument.setElementValue(element);
+                    element = null;
+                }
+                else {
+                    argument.setValue(value);
+                }
                 }
             }

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

@@ -65 +65 @@
 import org.greenstone.gatherer.cdm.DynamicListModel;
 import org.greenstone.gatherer.cdm.PlugIn;
+import org.greenstone.gatherer.msm.ElementWrapper;
+import org.greenstone.gatherer.msm.MSMUtils;
 import org.greenstone.gatherer.util.Utility;
 import org.w3c.dom.*;
@@ -339 +341 @@
                 // And if the argument is of a parameter type, parse a parameter.
                 if(argument.getType() != Argument.FLAG && tokenizer.hasMoreTokens()) {
-                argument.setValue(tokenizer.nextToken());
+                String value = tokenizer.nextToken();
+                ElementWrapper element = null;
+                if(argument.getType() == Argument.METADATA) {
+                    value = value.replace(':', MSMUtils.NS_SEP);
+                    if (value.indexOf(MSMUtils.NS_SEP)==-1){
+                    value = Utility.EXTRACTED_METADATA_NAMESPACE + MSMUtils.NS_SEP + value;
+                    }
+                    // Now retrieve the element this refers to, if available.
+                    element = Gatherer.c_man.getCollection().msm.getElement(value);
+                }
+                if(element != null) {
+                    argument.setElementValue(element);
+                    element = null;
+                }
+                else {
+                    argument.setValue(value);
+                }
                 }
                 key = null;