Changeset 8686

Timestamp:

2004-11-29T09:50:53+13:00 (19 years ago)

Author:

mdewsnip

Message:

No longer tries to load a config.xml file from the main GLI directory (it is never created here any more).

File:

• trunk/gli/src/org/greenstone/gatherer/Configuration.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -144 +144 @@
     this.site_name = site_name;
 
-    // Try to load the configuration file, first looking in the user specific location
+    // Try to load the configuration file from the user specific location
     String config_xml_file_name = CONFIG_XML;
     if (gsdl3_path != null) {
@@ -152 +152 @@
     if (config_xml_file != null && config_xml_file.exists()) {
         general_config = Utility.parse(config_xml_file.getAbsolutePath(), false);
-    }
-
-    // We then try within the gli directory itself
-    if (general_config == null) {
-        config_xml_file = new File(config_xml_file_name);
-        if (config_xml_file.exists()) {
-        general_config = Utility.parse(config_xml_file_name, true);
-        }
     }