Changeset 10367

Timestamp:

2005-08-01T12:10:30+12:00 (19 years ago)

Author:

mdewsnip

Message:

Added a new "-gliserver_url" command-line option for running a local GLI and using a remote Greenstone for building.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• GathererApplet.java (modified) (2 diffs)
• GetOpt.java (modified) (2 diffs)
• util/StaticStrings.java (modified) (1 diff)

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

@@ -132 +132 @@
     }
 
-    // Set the Greenstone path and collect directory specially when running with a remote Greenstone
+    // If a gliserver URL has been specified, we're using remote building
+    if (go.gliserver_url_string != null) {
+        isGsdlRemote = true;
+        cgiBase = go.gliserver_url_string.substring(0, go.gliserver_url_string.lastIndexOf('/') + 1);
+
+        // With remote building we use our own collect directory, since we can't use the Greenstone one
+        setCollectDirectoryPath(getGLIUserDirectoryPath() + "collect" + File.separator);
+    }
+
+    // Set the Greenstone path specially when running with a remote Greenstone
     if (isGsdlRemote) {
         go.gsdl_path = getGLIUserDirectoryPath();
-        setCollectDirectoryPath(go.gsdl_path + "collect" + File.separator);
     }
 

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

@@ -118 +118 @@
     // Set some global variables so we know how we're running
     Gatherer.isApplet = true;
-    Gatherer.isGsdlRemote = true;
-    String library_cgi = fullLibraryURL(getParameter("gwcgi"));
-    Gatherer.cgiBase = library_cgi.substring(0, library_cgi.lastIndexOf('/') + 1);
+    String library_url_string = fullLibraryURL(getParameter("gwcgi"));
+    String gliserver_url_string = library_url_string.substring(0, library_url_string.lastIndexOf('/') + 1) + "gliserver";
 
         // String debug_param = getParameter("debug");
@@ -127 +126 @@
         // }
 
-    String[] args = { "-gsdl", gli_user_directory.toString(),
-              "-library_url", library_cgi,
+    String[] args = { "-gliserver_url", gliserver_url_string,
+              "-library_url", library_url_string,
                     };
 

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

@@ -40 +40 @@
     public String collect_directory_path = null;
     public String filename = null;
+    public String gliserver_url_string = null;
     public String gsdl_path = null;
     public String gsdl3_path = null;
@@ -189 +190 @@
             library_url_string = argument_value;
             }
+            // Specify the URL to the gliserver CGI script for remote collection building
+            else if (argument_name.equals(StaticStrings.GLISERVER_URL_ARGUMENT)) {
+            gliserver_url_string = argument_value;
+            }
             // Parse the path to PERL. If not provided it assumes
             // perl should be availble on the PATH.

trunk/gli/src/org/greenstone/gatherer/util/StaticStrings.java

@@ -113 +113 @@
     static final public String FORMAT_STR                                 = "format";
     static final public String GLI_ATTRIBUTE                              = "gli";
+    static final public String GLISERVER_URL_ARGUMENT                     = "-gliserver_url";
     static final public String GREATER_THAN_CHARACTER                     = ">";
     static final public String GSDL_ARGUMENT                              = "-gsdl";