Changeset 22471 for main/trunk/greenstone2/cgi-bin/gliserver.pl

Timestamp:

2010-07-21T17:22:18+12:00 (14 years ago)

Author:

ak19

Message:

Changes to get collectgroup working with a Remote Greenstone server on Windows: get script options is to launch a script with arguments, one of which is the collection again, which can be a collectgroup. GLI passes the collection name in with a verticalbar separating the colgroup from the coltailname. The safe_val method called on the arguments to the script doesn't preserve backslashes and vertical bars, so the vertical bar is first replaced with a forward slash, then the safe_val method is called before the forward slash is replaced with the OS's File separator slash.

File:

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

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

@@ -1 @@
-#!/usr/bin/perl -w
+#!C:\Perl\bin\perl -w
 # Need to specify the full path of Perl above
 
@@ -818 +818 @@
     foreach my $cgi_arg_name ($gsdl_cgi->param) {
     my $cgi_arg_value = $gsdl_cgi->clean_param($cgi_arg_name) || "";
+    
+    # When get_script_options is to launch classinfo.pl or pluginfo.pl, one of the args to be passed to the script
+    # is the collection name. This may be a (collectgroup/)coltailname coming in here as (collectgroup|)coltailname.
+    # Since calling safe_val() below on the collection name value will get rid of \ and |, but preserves /, need to
+    # first replace the | with /, then run safe_val, then convert the / to the OS dependent File separator.
+    $cgi_arg_value =~ s@\|@\/@g if ($cgi_arg_name =~ m/^collection/);
     $cgi_arg_value = $gsdl_cgi->safe_val($cgi_arg_value);
+    $cgi_arg_value =~ s@\/@&util::get_dirsep()@eg if($cgi_arg_name =~ m/^collection/);
     if ($cgi_arg_value eq "") {
         $perl_args = "-$cgi_arg_name " . $perl_args;