Changeset 14302

Timestamp:

2007-08-06T09:40:37+12:00 (17 years ago)

Author:

qq6

Message:

Added configuration of the remote gs3

File:

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

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

@@ -92 +92 @@
 
     static public Configuration self = null;
-    static private String gli_user_directory_path = null;
+    static public String gli_user_directory_path = null;
 
     static public boolean just_updated_config_xml_file = false;
@@ -147 +147 @@
     // Try to load the configuration file from the user specific location
     String config_xml_file_name = CONFIG_XML;
-    if (gsdl3_path != null) {
+    if (gsdl3_path != null || (Gatherer.isGsdlRemote && Gatherer.GS3)) {
         config_xml_file_name = GS3_CONFIG_XML;
     }
@@ -193 +193 @@
         }
     }
-
-    if (gsdl3_path != null) {
+    
+    if (gsdl3_path != null || (Gatherer.GS3 && Gatherer.isGsdlRemote)) {
         if (this.site_name == null || this.site_name.equals("")) {
         this.site_name = getString("general.site_name", true);
@@ -690 +690 @@
     if (gsdl3_path!=null) {
         config_xml_name = GS3_CONFIG_XML;
+    }
+
+    if (Gatherer.isGsdlRemote) {
+        if (Gatherer.GS3){
+        config_xml_name = GS3_CONFIG_XML;
+        }else{
+        config_xml_name = CONFIG_XML;
+        }
     }
     try {