Changeset 16505

Timestamp:

2008-07-22T12:10:41+12:00 (15 years ago)

Author:

ak19

Message:

Does not read javahome and perlpath from gsdl3site.cfg, since setting them is no longer needed.

File:

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

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

@@ -285 +285 @@
     my $gsdlhome = $self->get_gsdl_home();
     my $gsdlos = $self->get_gsdl_os();
-    my $javahome = $self->get_java_home();
+    #my $javahome = $self->get_java_home();
 
     $ENV{'GSDL3SRCHOME'} = $gsdl3srchome;
     $ENV{'GSDLHOME'} = $gsdlhome;
     $ENV{'GSDLOS'} = $gsdlos;
-    $ENV{'JAVA_HOME'} = $javahome;
+    #$ENV{'JAVA_HOME'} = $javahome;
 
     require "$gsdlhome/perllib/util.pm";
@@ -304 +304 @@
     &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);
-    }
+    #else { # it's on linux now
+    #my $perlpath = $self->get_perl_path();
+    #&util::envvar_append("PATH", $perlpath);
+    #}
 }