Changeset 16509

Timestamp:

2008-07-22T13:41:28+12:00 (16 years ago)

Author:

ak19

Message:

Better processing of perlpath property so that it no longer needs to be uncommented when used.

File:

• gsdl/trunk/cgi-bin/gsdlCGI.pm (modified) (4 diffs)

gsdl/trunk/cgi-bin/gsdlCGI.pm

@@ -297 +297 @@
 sub get_perl_path {
     my $self = shift @_;
+    my ($optional) = @_;
     
     if (defined $self->{'perlpath'}) {
@@ -302 +303 @@
     }
 
-    my $perlpath = $self->get_config_info("perlpath");
+    my $perlpath = $self->get_config_info("perlpath", $optional);
 
     if(defined $perlpath) {
@@ -440 +441 @@
     &util::envvar_append("PATH",$gsdl_bin_os);
     
-    # Perl comes installed with the GS Windows Release Kit. 
-    # However, if GS is from SVN, the user must have their own Perl and put it on the path.
-    my $perl_bin_dir; # undefined
-    if ($gsdlos eq "windows") {
+    # If the "perlpath" property is set in the gsdl(3)site.cfg config file, it is
+    # prepended to PATH only if the same perl bin dir path is not already on PATH env
+    my $perl_bin_dir = $self->get_perl_path($optional);
+    if(defined $perl_bin_dir) 
+    {
+    &util::envvar_prepend("PATH", $perl_bin_dir);   
+    }
+    elsif ($gsdlos eq "windows") 
+    {
+    # Perl comes installed with the GS Windows Release Kit. However, note that if GS 
+    # is from SVN, the user must have their own Perl and put it on the PATH or set
+    # perlpath in the gsdl site config file.
     $perl_bin_dir = &util::filename_cat($gsdlhome, "bin", "windows", "perl", "bin");
     if(-e $perl_bin_dir) {
@@ -449 +458 @@
     }
     }
-
-    # Uncomment these lines if you want to read the "perlpath" property from
-    # the gsdl(3)site.cfg config file into PATH
-    #if(!defined $perl_bin_dir) {
-    #$perl_bin_dir = $self->get_perl_path();
-    #&util::envvar_append("PATH", $perl_bin_dir);
-    #}
-    
-    # gsdl(3)site.cfg can specify JAVA_HOME and FEDORA_HOME along with Fedora's version. Both
-    # are needed (by scripts g2f-import and g2f-buildcol) when using Greenstone 2 with Fedora.
-    if(!defined $ENV{'JAVA_HOME'}) {
-    $ENV{'JAVA_HOME'} = $self->get_java_home($optional);
-    }
-
+    
+    # If javahome is explicitly set in the gsdl site config file then it will override
+    # any env variable JAVA_HOME. A GS2 server does not set JAVA_HOME, though java is on
+    # the path. Therefore, if Fedora is being used for FLI with GS2, then javahome must 
+    # be set in gsdlsite.cfg or the JAVA_HOME env var must be explicitly set by the user.
+    my $java_home = $self->get_java_home($optional);
+    if(defined $java_home) {
+    $ENV{'JAVA_HOME'} = $java_home;
+    }
+
+    # FEDORA_HOME and FEDORA_VERSION are needed (by scripts g2f-import and g2f-buildcol).
     $self->setup_fedora_homes($optional);
 }