Changeset 5305

Timestamp:

2003-08-27T15:18:30+12:00 (21 years ago)

Author:

jmt12

Message:

Codec

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• msm/GDMDocument.java (modified) (3 diffs)
• msm/Metadata.java (modified) (1 diff)
• msm/MetadataSetManager.java (modified) (1 diff)
• util/HashMap3D.java (modified) (1 diff)
• util/MetadataXML.java (modified) (1 diff)

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

@@ -77 +77 @@
     /** Add this metadata to the named file. There is one tricky thing to consider. Whenever a metadata entry is added it is taken to be accumulating except if it is the first added, in which case it overwrites! */
     public void addMetadata(String filename, Metadata metadata) {
-    ///ystem.err.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
+    Gatherer.println("Add '" + metadata + "' to " + (filename != null ? filename : "directory."));
     try {
         // Retrieve the document element.
@@ -179 +179 @@
         metadata_element.setAttribute(MODE_ATTRIBUTE, ACCUMULATE);
         }
-                // As we can't possibly store all the metadata in memory, nor can we ensure that the indexes written to file remain the same until the new time we look at this file, and to avoid having to open a rewrite every collection document whenever any value tree changes, I'm adding a new attribute called hvalue which indicates the hierarchy value path as a '\' separated string.
+        // As we can't possibly store all the metadata in memory, nor can we ensure that the indexes written to file remain the same until the new time we look at this file, and to avoid having to open a rewrite every collection document whenever any value tree changes, I'm adding a new attribute called hvalue which indicates the hierarchy value path as a '\\' separated string.
         GValueModel model = Gatherer.c_man.getCollection().msm.getValueTree(metadata.getElement());
         if(model != null && model.isHierarchy()) {
-        metadata_element.setAttribute(HVALUE_ATTRIBUTE, metadata.getValueNode().getFullPath());
-        }
-        metadata_element.appendChild(base_document.createTextNode(metadata.getAbsoluteValue()));
+        metadata_element.setAttribute(HVALUE_ATTRIBUTE, metadata.getValueNode().getFullPath(false));
+        }
+        String node_value = metadata.getAbsoluteValue();
+        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).
         NodeList description_elements = fileset_element.getElementsByTagName("Description");
@@ -298 +299 @@
                     metadata = new Metadata(element, value);
                     GDMManager.metadata_cache.put(raw_element, raw_value, metadata);
-                    ///ystem.err.println("Added metadata to cache: " + raw_element + " -> " + raw_value + "\n");
+                    ///ystem.err.println("Added metadata to cache: " + raw_element + " -> " + raw_value + "\n");
                     value = null;
                     element = null;

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

@@ -125 +125 @@
     if(model != null && model.isHierarchy()) {
         if(value != null) {
-        abs_value = value.getFullPath();
+        abs_value = value.getFullPath(false);
         }
         abs_value = model.getHIndex(abs_value);

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

@@ -342 +342 @@
            || (mds.getNamespace().equals(Utility.EXTRACTED_METADATA_NAMESPACE) && mds.getNamespace().equals(HIDDEN) && all)) {
         NodeList set_elements = mds.getElements();
-        System.err.println("The set " + mds + " has " + set_elements.getLength() + " elements.");
+        ///ystem.err.println("The set " + mds + " has " + set_elements.getLength() + " elements.");
         for(int i = 0; i < set_elements.getLength(); i++) {
             Element raw_element = (Element)set_elements.item(i);

trunk/gli/src/org/greenstone/gatherer/util/HashMap3D.java

@@ -130 +130 @@
         }
         element_name = null;
-                // Locate the appropriate metadata
-        String value_name = metadata.getValueNode().getFullPath();
+        // Locate the appropriate metadata
+        String value_name = metadata.getValueNode().getFullPath(false);
         result = (Metadata) inner_mapping.get(value_name);
         if(result == null) {

trunk/gli/src/org/greenstone/gatherer/util/MetadataXML.java

@@ -157 +157 @@
         GValueNode node = (GValueNode)all_values.get(i);
         TreePath path = new TreePath(node.getPath());
-        String value = node.getFullPath(); // formatPath(null, path, true);
+        String value = node.getFullPath(false);
         String index = model.getHIndex(value);
         String alias = node.getAlias(index);
-        if(value.indexOf("\\") != -1) {
-            value = value.substring(value.lastIndexOf("\\") + 1);
+        if(value.indexOf(GValueModel.PATH_SEP) != -1) {
+            value = value.substring(value.lastIndexOf(GValueModel.PATH_SEP) + GValueModel.PATH_SEP.length());
         }
         write(bw, index + "\t\"" + alias + "\"\t\"" + Utility.stripNL(value) + "\"");