Changeset 34160 for main/trunk/gli

Timestamp:

2020-06-13T06:50:06+12:00 (4 years ago)

Author:

ak19

Message:

Completing TODO from Kathy's commit message for 34116 for ServletRealmCheck: still todo - get servlet name from input args, can't assume library.

Location:

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

Files:

• collection/CollectionManager.java (modified) (1 diff)
• remote/RemoteGreenstoneServer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -237 +237 @@
         command_parts_list.add("-library_name");
         String library_servlet_name = Configuration.servlet_path;
-        if(library_servlet_name.startsWith("/")) {
+        if(library_servlet_name.charAt(0) == '/') {
         library_servlet_name = library_servlet_name.substring(1);
         }

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

@@ -605 +605 @@
     if (Gatherer.GS3){
         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;
     }