Changeset 19797

Timestamp:

2009-06-10T16:05:04+12:00 (15 years ago)

Author:

kjdon

Message:

when a collection only had ex metadata set, we were removing it from our local list, then loading up dublin core and asking for the list of metadata sets again - which includes ex. doh. now just ask for the dublin core set

File:

• gli/trunk/src/org/greenstone/gatherer/cdm/DepositorMetadataManager.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/cdm/DepositorMetadataManager.java

@@ -202 +202 @@
         String file_name = Gatherer.getCollectDirectoryPath() + File.separator + current_coll_name + File.separator + "metadata";
         ArrayList metadata_sets = MetadataSetManager.listMetadataSets(new File(file_name));
-        
         if (metadata_sets != null) {
           // unload the ex mds
@@ -213 +212 @@
         }
         
-        if (metadata_sets == null || metadata_sets.size() == 0) {
+        if (metadata_sets == null) {
+          metadata_sets = new ArrayList();
+        }
+        if (metadata_sets.size() == 0) {
           // load dublin core
         file_name = org.greenstone.gatherer.gems.MetadataSetManager.getGLIMetadataDirectoryPath();
@@ -219 +221 @@
         File dublin_mds_file = new File(file_name);
         if (dublin_mds_file.exists()) {
-            MetadataSetManager.loadMetadataSet(dublin_mds_file);                    
-            metadata_sets = MetadataSetManager.getMetadataSets();
-        }
-        }
-        // if we are still null :-(
-        if (metadata_sets == null) {
+          MetadataSetManager.loadMetadataSet(dublin_mds_file);  
+          MetadataSet dc = MetadataSetManager.getMetadataSet("dc");
+          metadata_sets.add(dc);
+        }
+        }
+        // if we are still empty :-(
+        if (metadata_sets.size() == 0) {
         System.err.println("Error: DepositorMetadataMananger can't find any valid metadata set files.");
         return;