Changeset 8127

Timestamp:

2004-09-20T17:05:25+12:00 (20 years ago)

Author:

mdewsnip

Message:

A bit more new metadata code, this time for importing legacy metadata.

Location:

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

Files:

• MetadataValueTableModel.java (modified) (1 diff)
• MetadataXMLFile.java (modified) (2 diffs)
• ProfileXMLFile.java (added)
• ProfileXMLFileManager.java (added)

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

@@ -102 +102 @@
     public void rebuild(FileNode[] file_nodes)
     {
+    this.file_nodes = file_nodes;
     metadata_value_table_entries.clear();
 
     if (!Gatherer.c_man.ready()) {
-        Gatherer.println("Not ready!");
+        System.err.println("Not ready!");
         return;
     }
 
-    this.file_nodes = file_nodes;
-    if (file_nodes != null && file_nodes.length > 0) {
-        // Create model builder
-        MetadataValueTableModelBuilder builder = new MetadataValueTableModelBuilder();
-        builder.run();
-    }
+    if (file_nodes == null || file_nodes.length == 0) {
+        return;
+    }
+
+    // Create model builder
+    MetadataValueTableModelBuilder builder = new MetadataValueTableModelBuilder();
+    builder.run();
     }
 

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

@@ -4 +4 @@
 import java.io.*;
 import java.util.*;
+import org.greenstone.gatherer.gui.MetadataImportMappingPrompt;
 import org.greenstone.gatherer.util.XMLTools;
 import org.w3c.dom.*;
@@ -39 +40 @@
         MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
         if (metadata_set == null) {
+        // Check if we have an import mapping for this metadata element
+        String mapped_metadata_element_name_full = ProfileXMLFileManager.getMetadataElementFor(metadata_element_name_full);
+        System.err.println("  Mapped " + metadata_element_name_full + " to: " + mapped_metadata_element_name_full);
+        if (mapped_metadata_element_name_full == null) {
+            new MetadataImportMappingPrompt(metadata_element_name_full);
+        }
+
         // Skip this element if the metadata set isn't loaded
         continue;