Changeset 22314 for main/trunk/gli

Timestamp:

2010-06-28T14:13:17+12:00 (14 years ago)

Author:

kjdon

Message:

we are now extracted some metadata with ex. there, eg File.FileType from EmbeddedMetadataPlugin. Store this as ex.File.FileType so that GLI can pick it up as extracted metadata. Modified routines so that we look for no namespace and ex. namespace when getting extracted metadata

File:

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

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

@@ -117 +117 @@
 
         // If the metadata has a namespace it isn't extracted metadata, so we're not interested
+        // Actually, if it is ex. then we are interested 
         String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
-        if (!metadata_set_namespace.equals("")) {
+        
+        if (!metadata_set_namespace.equals("") && !metadata_set_namespace.equals("ex")) {
             continue;
         }
 
         // Extracted metadata!
-        String metadata_element_name = metadata_element_name_full;
+        // do it like this just in case we have ex.
+        String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
 
         // We completely ignore bibliographic data
@@ -218 +221 @@
         // 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("")) {
-            continue;
-        }
-
-        // Extracted metadata!
-        String metadata_element_name = metadata_element_name_full;
-
+        if (!metadata_set_namespace.equals("") && !metadata_set_namespace.equals("ex")) {
+            continue;
+        }
+
+        // Extracted metadata! May have ex. so make sure we remove that
+        String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
         // Note which file this is for
         if (metadata_element_name.equals("gsdlsourcefilename")) {