Changeset 8122 for trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java

Timestamp:

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

Author:

mdewsnip

Message:

Further improvements and bug fixes to the new metadata code.

File:

• trunk/gli/src/org/greenstone/gatherer/metadata/DocXMLFile.java (modified) (2 diffs)

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);
             }
         }