Changeset 31811 for main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

Timestamp:

2017-07-19T18:53:04+12:00 (7 years ago)

Author:

ak19

Message:

Cmdline testing of gliserver.pl revealed that gliserver's args (like cmd=check-installation) were being passed to the GS3 extensions and resulting in confusing and unnecessary error messages being printed from there. So now gsdlCGI.pm does gliserver's args are stored and emptied before calling the extension setup files and then restored thereafter.

File:

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

main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

@@ -631 +631 @@
     }
 
+    # Don't pass the arguments to gliserver.pl (e.g. cmd=check-installation) to Greenstone extensions' setup files
+    print STDERR "Args: " . join(",", @ARGV)."\n";
+    my @saved_args = @ARGV;
+    if (scalar(@ARGV>0)) {
+    @ARGV=();
+    }
+
     foreach my $ext_home (@ext_homes) {
     # Should really think about making this a subroutine
@@ -664 +671 @@
     }
 
+    # restore the args to gliserver.pl
+    @ARGV = @saved_args;
+    print STDERR "Args: " . join(",", @ARGV)."\n";
+
     # FEDORA_HOME and FEDORA_VERSION are needed (by scripts g2f-import and g2f-buildcol).
     $self->setup_fedora_homes($optional);