Changeset 14041 for trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java

Timestamp:

2007-05-03T09:12:21+12:00 (17 years ago)

Author:

xiao

Message:

Changes made to look for collectionConfig.xml in gs3 mode and collect.cfg in gs2 mode, rather than presumably only for the file collect.cfg.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/SuperCollectionManager.java (modified) (1 diff)

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

@@ -213 +213 @@
         File[] possible_collections = collect_directory.listFiles();
         for(int i = 0; possible_collections != null && i < possible_collections.length; i++) {
-        File collect_cfg_file = new File(possible_collections[i], Utility.CONFIG_FILE);
+        String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
+        File collect_cfg_file = new File(possible_collections[i], file_name);
         if (collect_cfg_file.exists()) {
             BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(collect_cfg_file);