Changeset 8122

Timestamp:

2004-09-15T17:16:29+12:00 (20 years ago)

Author:

mdewsnip

Message:

Further improvements and bug fixes to the new metadata code.

Location:

trunk/gli/src/org/greenstone/gatherer/metadata

Files:

• DocXMLFile.java (modified) (2 diffs)
• MetadataElement.java (modified) (1 diff)
• MetadataSet.java (modified) (1 diff)
• MetadataValueTableModel.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

@@ -76 +76 @@
                 if (!is_unix_path && !Utility.isWindows()) {
                     // Convert path from Windows to Unix
-                    gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\", File.separator);
+                    gsdlsourcefilename_value = gsdlsourcefilename_value.replaceAll("\\\\", File.separator);
                 }
                 }
@@ -158 +158 @@
             String metadata_element_name_full = current_metadata_element.getAttribute("name");
 
-            // If the metadata has no namespace, it is extracted metadata
+            // If the metadata has a namespace it isn't extracted metadata, so we're not interested
             String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
-            if (metadata_set_namespace.equals("")) {
-                metadata_set_namespace = MetadataSetManager.EXTRACTED_METADATA_NAMESPACE;
+            if (!metadata_set_namespace.equals("")) {
+                continue;
+            }
 
-                // We're not interested in lower-case metadata elements (gsdlsourcefilename, gsdlassocfile etc.)
-                if (Character.isLowerCase(metadata_element_name_full.charAt(0))) {
-                continue;
-                }
+            // Extracted metadata!
+            String metadata_element_name = metadata_element_name_full;
 
-                MetadataElement metadata_element = extracted_metadata_set.getMetadataElement(metadata_element_name_full);
-                if (metadata_element == null) {
-                // This element isn't defined in ex.mds, so we're uninterested
-                continue;
-                }
+            // Ignore lower-case metadata elements (gsdlsourcefilename, gsdlassocfile etc.)
+            //   and those starting with '/' (/srclink)
+            char first_character = metadata_element_name.charAt(0);
+            if (Character.isLowerCase(first_character) || first_character == '/') {
+                continue;
+            }
 
-                // Value trees are not stored for extracted metadata, so create a new value tree node now
-                String current_metadata_element_value = XMLTools.getElementTextValue(current_metadata_element);
-                metadata_element.addMetadataValue(current_metadata_element_value);
-                MetadataValueTreeNode metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(current_metadata_element_value);
+            MetadataElement metadata_element = extracted_metadata_set.getMetadataElement(metadata_element_name);
+            if (metadata_element == null) {
+                // This element isn't defined in ex.mds, so create it for this session
+                System.err.println("Extracted metadata element not defined: " + metadata_element_name);
+                metadata_element = extracted_metadata_set.addMetadataElementForThisSession(metadata_element_name);
+            }
 
-                // Add the new metadata value to the list
-                MetadataValue metadata_value = new MetadataValue(metadata_element, metadata_value_tree_node);
-                metadata_values.add(metadata_value);
-            }
+            // Value trees are not stored for extracted metadata, so create a new value tree node now
+            String current_metadata_element_value = XMLTools.getElementTextValue(current_metadata_element);
+            metadata_element.addMetadataValue(current_metadata_element_value);
+            MetadataValueTreeNode metadata_value_tree_node = metadata_element.getMetadataValueTreeNode(current_metadata_element_value);
+
+            // Add the new metadata value to the list
+            MetadataValue metadata_value = new MetadataValue(metadata_element, metadata_value_tree_node);
+            metadata_values.add(metadata_value);
             }
         }

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataElement.java

@@ -31 +31 @@
     {
     // Some extracted metadata elements may not be in ex.mds, and so have no attributes
-    // if (metadata_element_element == null) {
-    //     return null;
-    // }
+    if (metadata_element_element == null) {
+        return null;
+    }
 
     Element parent_element = metadata_element_element;

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataSet.java

@@ -38 +38 @@
         metadata_set_elements.add(new MetadataElement(metadata_element_name_full, metadata_element_element));
     }
+    }
+
+
+    public MetadataElement addMetadataElementForThisSession(String metadata_element_name)
+    {
+    String metadata_element_name_full = metadata_set_namespace + MetadataTools.NAMESPACE_SEPARATOR + metadata_element_name;
+    MetadataElement metadata_element = new MetadataElement(metadata_element_name_full, null);
+    metadata_set_elements.add(metadata_element);
+    return metadata_element;
     }
 

trunk/gli/src/org/greenstone/gatherer/metadata/MetadataValueTableModel.java

@@ -167 +167 @@
 
         // If we haven't seen this metadata element and it isn't extracted, add it now
-        if (!metadata_elements_seen.contains(metadata_element) && !metadata_element.isExtractedMetadata()) { 
+        if (!metadata_elements_seen.contains(metadata_element) && !metadata_element.isExtractedMetadata()) {
             MetadataValueTableEntry metadata_value_table_entry = new MetadataValueTableEntry(metadata_element, new MetadataValueTreeNode(""));