Changeset 8371

Timestamp:

2004-10-19T10:05:13+13:00 (20 years ago)

Author:

mdewsnip

Message:

Added some code for ignoring legacy "hidden" metadata.

File:

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

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

@@ -198 +198 @@
         Element current_metadata_element = (Element) metadata_elements_nodelist.item(k);
         String metadata_element_name_full = current_metadata_element.getAttribute("name");
-
         String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
+
+        // Ignore legacy crap
+        if (metadata_set_namespace.equals("hidden")) {
+            continue;
+        }
+
         MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
-
-        // If the metadata set isn't loaded give the option of mapping the element into a loaded set
         if (metadata_set == null) {
+            // The metadata set isn't loaded, so give the option of mapping the element into a loaded set
             String target_metadata_element_name_full = MetadataSetManager.mapUnloadedMetadataElement(metadata_element_name_full);
             if (target_metadata_element_name_full == null || target_metadata_element_name_full.equals("")) {
@@ -350 +354 @@
         Element current_metadata_element = (Element) metadata_elements_nodelist.item(i);
         String metadata_element_name_full = current_metadata_element.getAttribute("name");
-
         String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
+
+        // Ignore legacy crap
+        if (metadata_set_namespace.equals("hidden")) {
+        continue;
+        }
+
         MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
-
-        // If the metadata set isn't loaded give the option of mapping the element into a loaded set
         if (metadata_set == null) {
+        // The metadata set isn't loaded, so give the option of mapping the element into a loaded set
         String target_metadata_element_name_full = MetadataSetManager.mapUnloadedMetadataElement(metadata_element_name_full);
         if (target_metadata_element_name_full == null || target_metadata_element_name_full.equals("")) {