Changeset 10543

Timestamp:

2005-08-19T17:21:32+12:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed a bug where cgiBase wasn't set.

File:

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

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

@@ -138 +138 @@
         // We have to use our own collect directory since we can't use the Greenstone one
         setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
-
-        // If a gliserver URL has been specified...
-        if (go.gliserver_url_string != null) {
-        cgiBase = go.gliserver_url_string.substring(0, go.gliserver_url_string.lastIndexOf('/') + 1);
-        }
     }
     // No, we have a local Greenstone
@@ -292 +287 @@
         // If we're using a remote Greenstone we need to know where the gliserver script is
         DebugStream.println("Configuration.gliserver_url = " + Configuration.gliserver_url);
-        if (isGsdlRemote && Configuration.gliserver_url == null) {
-        missingGLIServer();
+        if (isGsdlRemote) {
+        if (Configuration.gliserver_url == null) {
+            missingGLIServer();
+        }
+        if (Configuration.gliserver_url != null) {
+            gliserver_url_string = Configuration.gliserver_url.toString();
+            cgiBase = gliserver_url_string.substring(0, gliserver_url_string.lastIndexOf('/') + 1);
+        }
         }