Changeset 16031

Timestamp:

2008-06-16T17:26:41+12:00 (16 years ago)

Author:

ak19

Message:

RemoteGreenstone 3 server requires the path to perl to be set in the PATH variable (whenever gliserver.pl does an eval using Perl). However the perl path is not passed to gliserver.pl by Tomcat (even though build.xml sets Tomcat's PATH). Therefore perlpath has been added as a user-definable property in file gsdl3site.cfg and will be read in by gsdlCGI(4gs3).pm. This is a problem similar to the issue of JAVA_HOME not being set for GS3.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm (modified) (2 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gsdlCGI4gs3.pm

@@ -232 +232 @@
 }
 
+sub get_perl_path {
+    my $self = shift @_;
+    
+    if (defined $self->{'perlpath'}) {
+    return $self->{'perlpath'};
+    }
+
+    my $perlpath = $self->get_config_info("perlpath");
+
+    $perlpath =~ s/(\/|\\)$//; # remove trailing slash
+
+    return $perlpath;
+}
+
 sub get_gsdl_os {
     my $self = shift @_;
@@ -276 +290 @@
     my $gsdl_perl_bin_directory = &util::filename_cat($gsdlhome, "bin", "windows", "perl", "bin");
     &util::envvar_append("PATH", $gsdl_perl_bin_directory);
+    }
+    else { # it's on linux now
+    my $perlpath = $self->get_perl_path();
+    &util::envvar_append("PATH", $perlpath);
     }
 }