Changeset 14048 for trunk

Timestamp:

2007-05-03T09:30:32+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/file/WorkspaceTreeNode.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/file/WorkspaceTreeNode.java

@@ -147 +147 @@
 
             // we don't care if there is no config file
-            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], Utility.CONFIG_FILE));
+            String file_name = (Gatherer.GS3)? Utility.CONFIG_GS3_FILE : Utility.CONFIG_FILE;
+            BasicCollectionConfiguration collect_cfg = new BasicCollectionConfiguration(new File(cols[i], file_name));
             WorkspaceTreeNode collection_root = new WorkspaceTreeNode(import_dir, collect_cfg.toString());
             collection_root.setParent(this);