Changeset 14567 for gli/trunk/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2007-09-25T10:13:24+12:00 (17 years ago)

Author:

qq6

Message:

if Configuration.library_url is given, assume a default Configuration.gliserver_urlGatherer.java

File:

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

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

@@ -132 +132 @@
     }
 
+    static private URL default_gliserver_url=null;
 
     public Gatherer(String[] args) 
@@ -291 +292 @@
         if (Configuration.library_url == null) {
         missingEXEC(); 
-        if ((Configuration.library_url!=null) && isGsdlRemote && GS3 && (gliserver_url_string==null)){
-            Configuration.gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl");
-            gliserver_url_string = Configuration.gliserver_url.toString();
-            Configuration.setString("general.gliserver_url", true, gliserver_url_string);
+        if ((Configuration.library_url!=null) && isGsdlRemote && (gliserver_url_string==null)){
+            if (GS3){
+            default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl");
+            }else{
+            default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl");
+            }
+            missingGLIServer();
         }
         }
@@ -313 +317 @@
         if (isGsdlRemote) {
         if (Configuration.gliserver_url == null) {
+            if (Configuration.library_url != null) {
+            if (GS3){
+                default_gliserver_url = new URL(Configuration.library_url.toString() + "/cgi-bin/gliserver4gs3.pl");
+            }else{
+                default_gliserver_url = new URL(Configuration.library_url.toString().substring(0,Configuration.library_url.toString().lastIndexOf("/library")) + "/gliserver.pl");
+            }
+            }
             missingGLIServer();
         }
@@ -781 +792 @@
     }
     dialog.setValueField(new URLField(Configuration.getColor("coloring.editable_foreground", false), Configuration.getColor("coloring.editable_background", false)));
+    
+    if (Gatherer.default_gliserver_url!=null){
+        dialog.setValueField(Gatherer.default_gliserver_url.toString());
+    }
+    
     dialog.display();
     dialog.dispose();
     dialog = null;
-
+    
     String gliserver_url_string = Configuration.getString("general.gliserver_url", true);
     if (!gliserver_url_string.equals("")) {