Changeset 22357 for main/trunk/gli

Timestamp:

2010-07-06T15:22:01+12:00 (14 years ago)

Author:

kjdon

Message:

.col file now called gli.col, not collname.col (to make it easy to renmae collections). Also, don't check for existence of metadata directory - we want to allow non-gli collections to be opened. so an etc/collect.cfg is enough

File:

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

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

@@ -298 +298 @@
             
             File config_file = new File(collection_folder, file_name);
-            File collection_metadata_directory = new File(collection_folder, "metadata");
             if (config_file.exists()) {
             BasicCollectionConfiguration collection_configuration = new BasicCollectionConfiguration(config_file);
@@ -309 +308 @@
             }
             else {
-                // if we have a metadata directory, then its a valid collection
-                if (collection_metadata_directory.exists()) {
-                data.add(collection_configuration);
-                }
+              // add this collection. We want to allow non gli collections, so add anything that has a config file.
+              data.add(collection_configuration);
             }
             }
@@ -385 +382 @@
         File etc_folder = collect_cfg_file.getParentFile();
         File collection_folder = etc_folder.getParentFile();
-        filename = collection_folder.getAbsolutePath() + File.separator + collection_folder.getName() + ".col";
+        filename = collection_folder.getAbsolutePath() + File.separator + "gli.col";
         collection_folder = null;
         etc_folder = null;