Changeset 36104

Timestamp:

2022-03-11T10:34:49+13:00 (2 years ago)

Author:

kjdon

Message:

added some handling around getting the default servlet path from gliserver. no longer want to assume library

Location:

main/trunk/gli/src/org/greenstone/gatherer/remote

Files:

• RemoteGreenstoneServer.java (modified) (2 diffs)
• RemoteGreenstoneServerAction.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -136 +136 @@
     }
 
+    // get the default servlet path from the server -- for a remote GLI of GS3
+    public String getDefaultServletPath() {
+    return performAction(new RemoteGreenstoneServerAction.GetDefaultServletPathAction());
+    }
     public String moveCollectionFile(String collection_name, File source_collection_file, File target_collection_file)
     {
@@ -604 +608 @@
     cgi_args += "&ts=" + System.currentTimeMillis();
     if (Gatherer.GS3){
-        cgi_args += "&site=" + Configuration.site_name;
+        String site_name = Configuration.site_name;
+        if (site_name != null && !site_name.equals("")) { 
+        cgi_args += "&site=" + Configuration.site_name;
+        }
         String library_servlet_name = Configuration.servlet_path;
-        if (library_servlet_name.charAt(0) == '/') {
-        library_servlet_name = library_servlet_name.substring(1);
-        }
-        cgi_args += "&servlet=" + library_servlet_name;
+        if (library_servlet_name != null && !library_servlet_name.equals("")) {
+        if (library_servlet_name.charAt(0) == '/') {
+            library_servlet_name = library_servlet_name.substring(1);
+        }
+        cgi_args += "&servlet=" + library_servlet_name;
+        }
     }
 

main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServerAction.java

@@ -494 +494 @@
     /**
      * --------------------------------------------------------------------------------------------
+     *    GET DEFAULT SERVLET PATH // for a remote GS3 
+     * --------------------------------------------------------------------------------------------
+     */
+    static class GetDefaultServletPathAction
+    extends RemoteGreenstoneServerAction
+    {
+    public GetDefaultServletPathAction()
+    {}
+
+    public void perform()
+        throws Exception
+    {
+        progress_bar.setAction("Getting default servlet ...");
+
+        String get_script_options_command = "cmd=get-default-servlet-path";
+        action_output = remote.sendCommandToServer(get_script_options_command, null);
+    }
+    }
+
+    /**
+     * --------------------------------------------------------------------------------------------
      *    MOVE COLLECTION FILE
      * --------------------------------------------------------------------------------------------