Changeset 34160 for main/trunk/greenstone2/common-src/cgi-bin

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.

File:

• main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl (modified) (2 diffs)

main/trunk/greenstone2/common-src/cgi-bin/gliserver.pl

@@ -315 +315 @@
     my $user_password = shift(@_);
     my $collection = shift(@_);
-    
+
+    # this is the only subroutine here that uses library servlet name param
+    my $library_servlet_name = $gsdl_cgi->clean_param("servlet");   
+    #if (!defined $library_servlet_name) {
+    #$library_servlet_name = "library";
+    #}
+    $gsdl_cgi->delete("servlet");
+
+        
     my $gsdl3home = $ENV{'GSDL3HOME'};
     my $java = $gsdl_cgi->get_java_path();
@@ -331 +339 @@
     my $java_args = "\"$gsdl3home\" \"$username\" \"$user_password\"";
     if ($collection ne "") {
-    $java_args .= " \"$collection\"";
-    }
-    
+    $java_args .= " -c \"$collection\"";
+    }
+    if (defined $library_servlet_name && $library_servlet_name !~ m/^\s*$/) {
+    $java_args .= " -s \"$library_servlet_name\"";
+    }
     $gsdl_cgi->checked_chdir($gsdl3home);   
     my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.ServletRealmCheck $java_args 2>&1";