Changeset 8125

Timestamp:

2004-09-17T12:54:55+12:00 (20 years ago)

Author:

mdewsnip

Message:

A few more improvements and bug fixes to the new metadata code.

Location:

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

Files:

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

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

@@ -193 +193 @@
     private void insertMetadataValueIntoTable(MetadataValue metadata_value)
     {
+        insertMetadataValueIntoTable(new MetadataValueTableEntry(metadata_value));
+    }
+
+
+    /** Alphabetically inserts the new metadata value into the table */
+    private void insertMetadataValueIntoTable(MetadataValueTableEntry metadata_value_table_entry)
+    {
         for (int i = 0; i < metadata_value_table_entries.size(); i++) {
         MetadataValueTableEntry current_metadata_value_table_entry = (MetadataValueTableEntry) metadata_value_table_entries.get(i);
-        int c = current_metadata_value_table_entry.compareTo(metadata_value);
+        int c = current_metadata_value_table_entry.compareTo(metadata_value_table_entry);
 
         // Insert value before existing entry
         if (c > 0) {
-            metadata_value_table_entries.add(i, new MetadataValueTableEntry(metadata_value));
+            metadata_value_table_entries.add(i, metadata_value_table_entry);
             fireTableRowsInserted(i, i);
             return;
@@ -212 +219 @@
 
         // Must go at the end of the table
-        metadata_value_table_entries.add(new MetadataValueTableEntry(metadata_value));
+        metadata_value_table_entries.add(metadata_value_table_entry);
         fireTableRowsInserted(metadata_value_table_entries.size() - 1, metadata_value_table_entries.size() - 1);
     }

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

@@ -38 +38 @@
         String metadata_set_namespace = MetadataTools.getMetadataSetNamespace(metadata_element_name_full);
         MetadataSet metadata_set = MetadataSetManager.getMetadataSet(metadata_set_namespace);
+        if (metadata_set == null) {
+        // Skip this element if the metadata set isn't loaded
+        continue;
+        }
 
         String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);