Changeset 8216

Timestamp:

2004-10-04T17:13:59+13:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed a bug with mapping already-namespaced metadata elements.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/MetadataImportMappingPrompt.java (modified) (4 diffs)
• metadata/MetadataSetManager.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/MetadataImportMappingPrompt.java

@@ -23 +23 @@
 
     private int result;
-    private String metadata_element_name = null;
+    private String metadata_element_name_full = null;
     private GComboBox metadata_sets_combobox = null;
     private GComboBox metadata_elements_combobox = null;
@@ -32 +32 @@
 
 
-    public MetadataImportMappingPrompt(String metadata_element_name)
+    public MetadataImportMappingPrompt(String metadata_element_name_full)
     {
-    this.metadata_element_name = metadata_element_name;
+    this.metadata_element_name_full = metadata_element_name_full;
 
     // Construction and configuration
@@ -87 +87 @@
     JPanel right_pane = new JPanel();
     right_pane.setLayout(new GridLayout(3,1));
-    right_pane.add(new JLabel(metadata_element_name));
+    right_pane.add(new JLabel(metadata_element_name_full));
     right_pane.add(metadata_sets_combobox);
     right_pane.add(metadata_elements_combobox);
@@ -175 +175 @@
     {
         boolean enable_add_button = true;
+        String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
 
         MetadataSet metadata_set = (MetadataSet) metadata_sets_combobox.getSelectedItem();
         ArrayList metadata_elements = metadata_set.getMetadataSetElements();
+
         metadata_elements_combobox.removeAllItems();
         for (int i = 0; i < metadata_elements.size(); i++) {

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

@@ -145 +145 @@
 
 
-    static public String mapUnloadedMetadataElement(String metadata_element_name)
+    static public String mapUnloadedMetadataElement(String metadata_element_name_full)
     {
     // Check if we have an import mapping for this metadata element
-    String target_metadata_element_name_full = ProfileXMLFileManager.getMetadataElementFor(metadata_element_name);
+    String target_metadata_element_name_full = ProfileXMLFileManager.getMetadataElementFor(metadata_element_name_full);
     if (target_metadata_element_name_full != null) {
         // Yes, so return it
@@ -160 +160 @@
 
     // Ask the user how they want to deal with this element
-    MetadataImportMappingPrompt metadata_import_mapping_prompt = new MetadataImportMappingPrompt(metadata_element_name);
+    MetadataImportMappingPrompt metadata_import_mapping_prompt = new MetadataImportMappingPrompt(metadata_element_name_full);
     int result = metadata_import_mapping_prompt.getResult();
 
@@ -166 +166 @@
     if (result == MetadataImportMappingPrompt.ADD_BUTTON_PRESSED) {
         MetadataSet target_metadata_set = metadata_import_mapping_prompt.getSelectedMetadataSet();
+        String metadata_element_name = MetadataTools.getMetadataElementName(metadata_element_name_full);
         target_metadata_set.addMetadataElementForThisSession(metadata_element_name);
         target_metadata_element_name_full = target_metadata_set.getNamespace() + "." + metadata_element_name;
@@ -182 +183 @@
 
     // Store this import mapping for future elements with the same name
-    ProfileXMLFileManager.mapElement(metadata_element_name, target_metadata_element_name_full);
+    ProfileXMLFileManager.mapElement(metadata_element_name_full, target_metadata_element_name_full);
 
     return target_metadata_element_name_full;