Changeset 6029

Timestamp:

2003-11-28T17:40:46+13:00 (20 years ago)

Author:

jmt12

Message:

Removed the hvalue attribute from metadata.xml files as it is now obsolete

File:

• trunk/gli/src/org/greenstone/gatherer/msm/GDMDocument.java (modified) (10 diffs)

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

@@ -56 +56 @@
     static final private String FILESET_ELEMENT = "FileSet";
     static final private String HVALUE_ATTRIBUTE = "hvalue";
-    static final private String METADATA_ELEMENT = "Metadata";
     static final private String MODE_ATTRIBUTE = "mode";
-    static final private String NAME_ATTRIBUTE = "name";
     static final private String OVERWRITE = "overwrite";
 
@@ -147 +145 @@
         }
         // Now, finally, we can add the metadata.
-        Element metadata_element = base_document.createElement(METADATA_ELEMENT);
+        Element metadata_element = base_document.createElement(StaticStrings.METADATA_ELEMENT);
         String name = metadata.getElement().getName();
         if(name.startsWith(Utility.EXTRACTED_METADATA_NAMESPACE)) {
         name = name.substring(Utility.EXTRACTED_METADATA_NAMESPACE.length() + 1);
         }
-        metadata_element.setAttribute(NAME_ATTRIBUTE, name);
+        metadata_element.setAttribute(StaticStrings.NAME_ATTRIBUTE, name);
 
         // To determine if this metadata entry should overwrite or accumulate we check if there are other entries with the same element in this fileset.
@@ -159 +157 @@
         for(int k = 0; !will_accumulate && k < sibling_description_elements.getLength(); k++) {
         Element sibling_description_element = (Element) sibling_description_elements.item(k);
-        NodeList sibling_metadata_elements = sibling_description_element.getElementsByTagName(METADATA_ELEMENT);
+        NodeList sibling_metadata_elements = sibling_description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
         for(int l = 0; !will_accumulate && l < sibling_metadata_elements.getLength(); l++) {
             Element sibling_metadata_element = (Element) sibling_metadata_elements.item(l);
             // It appears that its possible that we can be asked to add the same metadata twice (especially after a copy action is cancelled then repeated). So we check if we have been asked to add exactly the same value twice.
-            if(sibling_metadata_element.getAttribute(NAME_ATTRIBUTE).equals(metadata_element.getAttribute(NAME_ATTRIBUTE))) {
+            if(sibling_metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE).equals(metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE))) {
                 // Check the values and return if they are the same.
                if(metadata.getAbsoluteValue().equals(MSMUtils.getValue(sibling_metadata_element))) {
@@ -179 +177 @@
         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 writing the value out as a full path string
         GValueModel model = Gatherer.c_man.getCollection().msm.getValueTree(metadata.getElement());
         String node_value = null;
         if(model != null && model.isHierarchy()) {
             node_value = Codec.transform(metadata.getValueNode().getFullPath(false), Codec.TEXT_TO_DOM);
-            ///ystem.err.println("Saving H Info: " + node_value);
-            metadata_element.setAttribute(HVALUE_ATTRIBUTE, node_value);
         }
         else {
             node_value = metadata.getAbsoluteValue();
-            ///ystem.err.println("Not H Info: " + node_value);
         }
         ///ystem.err.println("Creating node in GDMDocument: '" + node_value + "'");
@@ -221 +216 @@
         for(int k = 0; k < description_elements.getLength(); k++) {
             Element description_element = (Element) description_elements.item(k);
-            NodeList metadata_elements = description_element.getElementsByTagName(METADATA_ELEMENT);
+            NodeList metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
             count = count + metadata_elements.getLength();
             metadata_elements = null;
@@ -248 +243 @@
     /** Retrieve the metadata associated with the given filename. Keep track of what metadata should be overwritten and what should be accumulated. Also make note of the source file, and remove the metadata if required. Finally if purge is set retrieve every piece of metadata in this file. */
     public ArrayList getMetadata(String filename, boolean remove, ArrayList metadatum_so_far, File file, boolean append_folder_level, boolean purge) {
-    ///ystem.err.println("Get metadata for " + filename);
+    Gatherer.println("Get metadata for " + filename);
     ArrayList metadatum = null;
     if(metadatum_so_far == null) {
@@ -267 +262 @@
             Element filename_element = (Element) filename_elements.item(j);
             String filename_text = MSMUtils.getValue(filename_element);
-            if((filename != null && filename.matches(filename_text)) || ((filename == null || append_folder_level) && filename_text.equals(DIRECTORY_FILENAME)) || purge) {
+            if((filename != null && (filename.matches(filename_text) || (append_folder_level && filename.indexOf(File.separator) != -1 && filename_text.equals(filename.substring(0, filename.indexOf(File.separator)))))) || ((filename == null || append_folder_level) && filename_text.equals(DIRECTORY_FILENAME)) || purge) {
             // If they match add all of the metadata found in the Description child element, remembering to abide by desired mode (accumulate vs. overwrite).
             NodeList description_elements = fileset_element.getElementsByTagName(DESCRIPTION_ELEMENT);
             for(int k = 0; k < description_elements.getLength(); k++) {
                 Element description_element = (Element) description_elements.item(k);
-                NodeList metadata_elements = description_element.getElementsByTagName(METADATA_ELEMENT);
+                NodeList metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
                 for(int l = 0; l < metadata_elements.getLength(); l++) {
                 Element metadata_element = (Element) metadata_elements.item(l);
-                String raw_element = metadata_element.getAttribute(NAME_ATTRIBUTE);
+                String raw_element = metadata_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
                 //String language = metadata_element.getAttribute("language");
                 String mode = metadata_element.getAttribute(MODE_ATTRIBUTE);
-                String raw_value = metadata_element.getAttribute(HVALUE_ATTRIBUTE);
-                if(raw_value == null || raw_value.length() == 0) {
-                   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);
-                }
+                String 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 *****
                 // If this raw_value contains a '\' character, but no '\\', '[' or ']' characters, then replace the '\' with a '\\'
@@ -290 +282 @@
                     raw_value = raw_value.replaceAll(StaticStrings.ESCAPE_PATTERN, StaticStrings.PIPE_STR);
                     Gatherer.println("Updated Path To: " + raw_value);
-                    metadata_element.setAttribute(HVALUE_ATTRIBUTE, raw_value);
+                    MSMUtils.setValue(metadata_element, raw_value);
                 }
                 // **************************
@@ -451 +443 @@
             for(int k = 0; !found && k < description_elements.getLength(); k++) {
                 Element description_element = (Element) description_elements.item(k);
-                NodeList metadata_elements = description_element.getElementsByTagName("Metadata");
+                NodeList metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
                 for(int l = 0; (!found || !make_next_metadata_element_overwrite) && l < metadata_elements.getLength(); l++) {
                 Element metadata_element = (Element) metadata_elements.item(l);
@@ -484 +476 @@
                 metadata_element = null;
                 }
-                metadata_elements = description_element.getElementsByTagName("Metadata");
+                metadata_elements = description_element.getElementsByTagName(StaticStrings.METADATA_ELEMENT);
                 // If we found it, removed it, and now the description tag has no children, mark the fileset for removal
                 if(metadata_elements.getLength() == 0) {