Changeset 18946 for gli/trunk

Timestamp:

2009-04-14T14:33:28+12:00 (15 years ago)

Author:

kjdon

Message:

check the config file for collectgroup before checking whether the metadata directory exists - collectgroups aren't likely to have this

File:

• gli/trunk/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java (modified) (4 diffs)

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

@@ -217 +217 @@
         for (int s=0; s<sites.length; s++) {
         String site_name = sites[s].getName();
-        System.err.println("found site "+site_name);
         File collect_folder = new File(Utility.getCollectDir(Configuration.gsdl3_path, site_name) );
         if (!collect_folder.exists()) {
@@ -282 +281 @@
     protected void load_collection_configs(TreeSet data, File collect_directory) {
 
-        File[] collection_folders = collect_directory.listFiles();
+        File[] collection_folders = collect_directory.listFiles();
 
         for(int i = 0; i < collection_folders.length; i++) {
@@ -300 +299 @@
             File config_file = new File(collection_folder, file_name);
             File collection_metadata_directory = new File(collection_folder, "metadata");
-            if (collection_metadata_directory.exists() && config_file.exists()) {
+            if (config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
 
@@ -310 +309 @@
             }
             else {
-                data.add(collection_configuration);
+                // if we have a metadata directory, then its a valid collection
+                if (collection_metadata_directory.exists()) {
+                data.add(collection_configuration);
+                }
             }
             }