Changeset 14063 for trunk/gli/src/org/greenstone/gatherer/gui/OpenCollectionDialog.java

Timestamp:

2007-05-07T14:07:30+12:00 (17 years ago)

Author:

xiao

Message:

prevent legacy collections from being opened in gli

File:

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

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

@@ -248 +248 @@
         return;
         }
-        File[] collection_folders = collect_directory.listFiles();
+        File[] collection_folders = collect_directory.listFiles();
         for(int i = 0; i < collection_folders.length; i++) {
         File collection_folder = collection_folders[i];
         String collection_foldername = collection_folder.getName();
-        String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
         if(collection_folder.isDirectory() && !collection_foldername.equals(StaticStrings.MODEL_COLLECTION_NAME)) {
+            // this 'file_name' has already been prefixed by 'etc'
+            String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
             File config_file = new File(collection_folder, file_name);
-            if (config_file.exists()) {
+            File collection_metadata_directory = new File(collection_folder, "metadata");
+            if (collection_metadata_directory.exists() && config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
             data.add(collection_configuration);