Changeset 13820

Timestamp:

2007-01-26T12:30:33+13:00 (17 years ago)

Author:

shaoqun

Message:

added code to pass the skimfile switch to MetadataXMLFileManager

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• collection/CollectionManager.java (modified) (2 diffs)
• gui/ExplodeMetadataDatabasePrompt.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -962 +962 @@
         }
 
-        MetadataSetManager.clearMetadataSets();
+            MetadataSetManager.clearMetadataSets();
         MetadataSetManager.loadMetadataSets(collection_metadata_directory);
 
@@ -980 +980 @@
         // Read through the metadata.xml files in the import directory, building up the metadata value trees
         MetadataXMLFileManager.clearMetadataXMLFiles();
-        MetadataXMLFileManager.loadMetadataXMLFiles(collection_import_directory);
+        MetadataXMLFileManager.loadMetadataXMLFiles(collection_import_directory,collection.toSkimFile());
 
         // Read through the doc.xml files in the archives directory

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

@@ -46 +46 @@
 import org.greenstone.gatherer.collection.CollectionManager;
 import org.greenstone.gatherer.collection.ScriptOptions;
+import org.greenstone.gatherer.collection.Collection;
 import org.greenstone.gatherer.greenstone.LocalGreenstone;
 import org.greenstone.gatherer.gui.tree.DragTree;
@@ -348 +349 @@
 
         // Load the new metadata.xml files
-        MetadataXMLFileManager.loadMetadataXMLFiles(metadata_file.getParentFile());
+                Collection collection = Gatherer.c_man.getCollection();
+                MetadataXMLFileManager.loadMetadataXMLFiles(metadata_file.getParentFile(),collection.toSkimFile());
         Gatherer.g_man.refreshCollectionTree(DragTree.COLLECTION_CONTENTS_CHANGED);
         resultPrompt(true, error_message.toString());