Changeset 33011 for main/trunk/greenstone2/common-src/cgi-bin/index-server.pl

Timestamp:

2019-04-12T19:36:30+12:00 (5 years ago)

Author:

ak19

Message:

On Ubuntu 18.04, confirmed Renate's findings that gsdlCGI.pm wasn't found by gliserver.pl in its @INC paths. Have now added the containing cgi-bin folder on GS2 and cgi folder on GS3 to @INC to teach gliserver.pl to find gsdlCGI.pm. This however needed a fix in build.xml where force-start-tomcat was passing the wrong value for GSDL3HOME to tomcat: it was passing in basedir instead of web.home. With this fix, gliserver.pl now works on Ubuntu 18.04. Have added lines identical to the changes in gliserver.pl to the other pl files in the cgi(-bin) folder for those pl files that similarly import gsdlCGI.pm.

File:

• main/trunk/greenstone2/common-src/cgi-bin/index-server.pl (modified) (1 diff)

main/trunk/greenstone2/common-src/cgi-bin/index-server.pl

@@ -11 +11 @@
     Win32::SetChildShowWindow(0)
     if defined &Win32::SetChildShowWindow;
+
+    # On Ubuntu 18.04, gsdlCGI.pm can't be found as the cgi folder is not among @INC paths.
+    # Ensure gsdlCGI.pm is available in @INC by adding the cgi folder to it.
+    # For GS2:
+    my $gsdl_cgi_path = $ENV{'GSDLHOME'} . "/cgi-bin";
+    # For GS3:
+    $gsdl_cgi_path = $ENV{'GSDL3HOME'} . "/WEB-INF" . "/cgi" if defined $ENV{'GSDL3HOME'};
+
+    my $found_cgi_path = 0;
+    foreach my $inc_path (@INC) {
+        if($inc_path eq $gsdl_cgi_path) {
+                $found_cgi_path = 1;
+                last;
+        }
+    }
+    if(!$found_cgi_path) {
+      unshift (@INC, $gsdl_cgi_path);
+    }
 }