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

Timestamp:

2005-02-15T15:39:48+13:00 (19 years ago)

Author:

mdewsnip

Message:

Made major rearrangements to the way path variables are calculated. This is to facilitate being able to specify a "-collectdir" argument to the GLI so one GLI installation can be used in a networked, multi-user situation. Hope I haven't broken anything!

File:

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

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

@@ -196 +196 @@
         current_coll_name = Gatherer.c_man.getCollection().getName();
 
-        File gsdl_collection_directory;
-        if (Gatherer.GS3) {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl3_path, Configuration.site_name));
-        }
-        else {
-        gsdl_collection_directory = new File(Utility.getCollectDir(Configuration.gsdl_path));
-        }
-
-        File[] possible_collections = gsdl_collection_directory.listFiles();
+        File collect_directory = new File(Gatherer.getCollectDirectoryPath());
+        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);