Changeset 8141

Timestamp:

2004-09-23T15:12:04+12:00 (20 years ago)

Author:

mdewsnip

Message:

Now can add elements to metadata sets when importing non-namespaced metadata elements. Is this the very last piece of new metadata code?

Just a lot of bug fixes to come, I think...

Location:

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

Files:

• MetadataSetManager.java (modified) (1 diff)
• MetadataXMLFile.java (modified) (1 diff)

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

@@ -138 +138 @@
     int result = metadata_import_mapping_prompt.getResult();
 
-    // !!! Add the element into an existing metadata set
+    // Add the element into an existing metadata set
     if (result == MetadataImportMappingPrompt.ADD_BUTTON_PRESSED) {
         MetadataSet target_metadata_set = metadata_import_mapping_prompt.getSelectedMetadataSet();
-        System.err.println("Added to " + target_metadata_set);
-        // target_metadata_element_name_full = 
+        target_metadata_set.addMetadataElementForThisSession(metadata_element_name);
+        target_metadata_element_name_full = target_metadata_set.getNamespace() + "." + metadata_element_name;
     }
 

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

@@ -343 +343 @@
         MetadataElement metadata_element = metadata_set.getMetadataElement(metadata_element_name);
 
+        // If the element doesn't exist in the metadata set, add it
+        if (metadata_element == null) {
+        metadata_element = metadata_set.addMetadataElementForThisSession(metadata_element_name);
+        }
+
         String metadata_element_value = XMLTools.getElementTextValue(current_metadata_element);
         metadata_element.addMetadataValue(metadata_element_value);