Changeset 5668 for trunk

Timestamp:

2003-10-17T04:45:05+13:00 (21 years ago)

Author:

jmt12

Message:

Slight changes to allow [ and ] fix

Location:

trunk/gli/src/org/greenstone/gatherer/msm

Files:

• GDMDocument.java (modified) (5 diffs)
• Metadata.java (modified) (2 diffs)
• MetadataSetManager.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java

@@ -32 +32 @@
 import org.greenstone.gatherer.msm.GDMManager;
 import org.greenstone.gatherer.msm.MSMUtils;
+import org.greenstone.gatherer.util.Codec;
 import org.greenstone.gatherer.util.HashMap3D;
 import org.greenstone.gatherer.util.StaticStrings;
@@ -164 +165 @@
             if(sibling_metadata_element.getAttribute(NAME_ATTRIBUTE).equals(metadata_element.getAttribute(NAME_ATTRIBUTE))) {
                 // Check the values and return if they are the same.
-                //if(metadata_element.getAttribute(NAME_ATTRIBUTE).equalsIgnoreCase("dls.Title")) {
-                //  Gatherer.println("Comparing:");
-                //  Gatherer.println("'" + metadata.getAbsoluteValue() + "'");
-                //  Gatherer.println(" with:");
-                //  Gatherer.println("'" + MSMUtils.getValue(sibling_metadata_element) + "'");
-                //}
-                if(metadata.getAbsoluteValue().equals(MSMUtils.getValue(sibling_metadata_element))) {
-                //  Gatherer.println("Value already exists: " + metadata);
-                    return;
-                }
-                will_accumulate = true;
-            }
+               if(metadata.getAbsoluteValue().equals(MSMUtils.getValue(sibling_metadata_element))) {
+              return;
+               }
+               will_accumulate = true;
+            }
             sibling_metadata_element = null;
         }
@@ -191 +185 @@
         }
         String node_value = metadata.getAbsoluteValue();
+        ///ystem.err.println("Creating node in GDMDocument: '" + node_value + "'");
         metadata_element.appendChild(base_document.createTextNode(node_value));
         // Retrieve the first description element for this fileset (there should only be one, but I'll play it safe).
@@ -279 +274 @@
                 String raw_value = metadata_element.getAttribute(HVALUE_ATTRIBUTE);
                 if(raw_value == null || raw_value.length() == 0) {
-                    raw_value = MSMUtils.getValue(metadata_element);
+                   raw_value = MSMUtils.getValue(metadata_element);
+                   // Raw value is in GREENSTONE form, convert to DOM
+                   raw_value = Codec.transform(raw_value, Codec.GREENSTONE_TO_DOM);
                 }
                 // ***** LEGACY SUPPORT *****
@@ -498 +495 @@
     this.up_to_date = up_to_date;
     }
-
-    /** Decode a string that was previously made Perl safe. */
-    private String decode(String safe) {
-    return safe.replaceAll("\\\\.",".");
-    }
-
-    /** Encodes unsafe filename characters (such as the . before the file extension) into Perl safe ones. */
-    private String encode(String dangerous) {
-    return dangerous.replaceAll("\\.", "\\\\.");
-    }
 }

trunk/gli/src/org/greenstone/gatherer/msm/Metadata.java

@@ -120 +120 @@
     }
     /** Determine the absolute path value of this metadata, taking into account whether this value is hierarchical. */
-    public String getAbsoluteValue() {
-    String abs_value = getValue();
+   public String getAbsoluteValue() {
+        String abs_result = "";
+    if(value != null) {
+        abs_result = value.toString(GValueNode.GREENSTONE);
+    }
+    return abs_result;
+    
+    //String abs_value = getValue();
     // What actually gets written as the value depends on whether this is a hierarchy based element.
-    GValueModel model = Gatherer.c_man.getCollection().msm.getValueTree(element);
-    /*if(model != null && model.isHierarchy()) {
-        if(value != null) {
-        abs_value = value.getFullPath(false);
-        }
-        abs_value = model.getHIndex(abs_value);
-    }
-    else {*/
-        abs_value = abs_value.replaceAll(StaticStrings.LBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.LBRACKET_PATTERN);
-        abs_value = abs_value.replaceAll(StaticStrings.RBRACKET_PATTERN, StaticStrings.ESCAPE_PATTERN + StaticStrings.RBRACKET_PATTERN);
-        //}
+    //GValueModel model = Gatherer.c_man.getCollection().msm.getValueTree(element);
     // Return the result
-    return abs_value;
+    //return abs_value;
     }
     /** Retrieve the reference count.
@@ -207 +203 @@
     return element.toString() + "=" + getValue();
     }
+   
     /** Retrieve the value node associated with a certain value string. */
     static final public GValueNode getDefaultValueNode(ElementWrapper element, String value) {

trunk/gli/src/org/greenstone/gatherer/msm/MetadataSetManager.java

@@ -104 +104 @@
      * @param value The value to assign to the metadata as a String.
      */
-    public void addMetadata(long id, FileNode records[], ElementWrapper element, String value_str) {
-    if (records.length == 1) {
-        addMetadata(id, records, element, value_str, MetaEditPrompt.ACCUMULATE_ALL);
-    }
-    else {
-        addMetadata(id, records, element, value_str, MetaEditPrompt.CONFIRM);
-    }
-    }
-    public void addMetadata(long id, FileNode records[], ElementWrapper element, String value_str, int action) {
+    public Metadata addMetadata(long id, FileNode records[], ElementWrapper element, String value_str) {
+       Metadata metadata = null;
+       if (records.length == 1) {
+      metadata = addMetadata(id, records, element, value_str, MetaEditPrompt.ACCUMULATE_ALL);
+       }
+       else {
+      metadata = addMetadata(id, records, element, value_str, MetaEditPrompt.CONFIRM);
+       }
+       return metadata;
+    }
+    public Metadata addMetadata(long id, FileNode records[], ElementWrapper element, String value_str, int action) {
     // Retrieve the appropriate value node from the value tree for this element, creating it if necessary.
     GValueModel model = getValueTree(element);
@@ -138 +140 @@
         }
     }
+    return metadata;
     }
 
@@ -1072 +1075 @@
     }
     else {
-                // Recover the metadata from this file.
+       // Recover the metadata from this file.
         ArrayList metadata = Gatherer.c_man.getCollection().gdm.getMetadata(record.getFile());
-                // Most important test, we don't have to add the metadata if its already there!
+        // Most important test, we don't have to add the metadata if its already there!
         if(!metadata.contains(data)) {
         // Record undo information for this file node.