Changeset 12735

Timestamp:

2006-09-13T16:16:59+12:00 (18 years ago)

Author:

mdewsnip

Message:

The GLI now correctly loads metadata from exploded metadata databases when records_per_folder has been used.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• gui/ExplodeMetadataPrompt.java (modified) (1 diff)
• metadata/MetadataXMLFileManager.java (modified) (1 diff)

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

@@ -309 +309 @@
         int exit_value = explodeMetadata();
         if (exit_value == 0) { // success
-        String new_dir = metadata_file.getPath();
-        // remove the extension to get the directory name
-        new_dir = new_dir.substring(0, new_dir.lastIndexOf('.'));
-        MetadataXMLFileManager.loadMetadataXMLFiles(new File(new_dir));
+        // Load the new metadata.xml files
+        MetadataXMLFileManager.loadMetadataXMLFiles(metadata_file.getParentFile());
         Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);
         resultPrompt(true, error_message.toString());

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

@@ -260 +260 @@
     {
     MetadataXMLFile metadata_xml_file = new MetadataXMLFile(metadata_xml_file_file.getAbsolutePath());
+    if (metadata_xml_files.contains(metadata_xml_file)) {
+        // This metadata.xml file has already been loaded, so return the loaded object
+        return (MetadataXMLFile) metadata_xml_files.get(metadata_xml_files.indexOf(metadata_xml_file));
+    }
+
     metadata_xml_file.skimFile();
     metadata_xml_files.add(metadata_xml_file);