Changeset 18947 for gli/trunk/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java

Timestamp:

2009-04-14T14:35:18+12:00 (15 years ago)

Author:

kjdon

Message:

don't use existence of metadata directory as not collect group, as there may be one there. Look at the collect.cfg first, then test metadata dir

File:

• gli/trunk/src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (1 diff)

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

@@ -336 +336 @@
         File collect_cfg_file = new File(possible_collections[i], file_name);
         if (collect_cfg_file.exists()) {
-        // If the directory has a metadata/ then the collection can be used as a base
-        File metadata_directory = new File(possible_collections[i], "metadata");
-        if (metadata_directory.exists()) {
-            // Add to model
-            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
-            if (Gatherer.GS3 && site != null) {
-            collect_cfg.setSite(site);
-            }
-            Item item = new Item(possible_collections[i], collect_cfg);
-            if (!base_collection_model.contains(item)) {
-            base_collection_model.add(item);
-            }
-        } else {
-
-          // we may be a group coll. Check the collect.cfg for collectgroup=true
-          BasicCollectionConfiguration config = new BasicCollectionConfiguration(collect_cfg_file);
-          if (config.getCollectGroup().equals("true")) {
+        // Check for group coll: Check the collect.cfg for collectgroup=true
+        BasicCollectionConfiguration config = new BasicCollectionConfiguration(collect_cfg_file);
+        if (config.getCollectGroup().equals("true")) {
             // try subdirs in here
             addCollectionsToModel(base_collection_model, possible_collections[i], site);
-          }
+        } 
+        else {
+            
+            // If the directory has a metadata/ then the collection can be used as a base
+            File metadata_directory = new File(possible_collections[i], "metadata");
+            if (metadata_directory.exists()) {
+            // Add to model
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);
+            if (Gatherer.GS3 && site != null) {
+                collect_cfg.setSite(site);
+            }
+            Item item = new Item(possible_collections[i], collect_cfg);
+            if (!base_collection_model.contains(item)) {
+                base_collection_model.add(item);
+            }
+            }
         }
         }