Changeset 15960 for greenstone3

Timestamp:

2008-06-11T20:43:46+12:00 (16 years ago)

Author:

ak19

Message:

Processes new variable javahome that has been simultaneously introduced into gsdl3site.cfg which this uses to set the JAVA_HOME environment variable, so that the doing a gliserver check-installation in the browser will no longer fail with JAVA_HOME not set.

File:

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

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

@@ -216 +216 @@
 }
 
+sub get_java_home {
+    my $self = shift @_;
+    
+    if (defined $self->{'javahome'}) {
+    return $self->{'javahome'};
+    }
+
+    my $javahome = $self->get_config_info("javahome");
+
+    $javahome =~ s/(\/|\\)$//; # remove trailing slash
+
+    $self->{'javahome'} = $javahome;
+
+    return $javahome;
+}
+
 sub get_gsdl_os {
     my $self = shift @_;
@@ -242 +258 @@
     my $gsdlhome = $self->get_gsdl_home();
     my $gsdlos = $self->get_gsdl_os();
+    my $javahome = $self->get_java_home();
 
     $ENV{'GSDL3SRCHOME'} = $gsdl3srchome;
     $ENV{'GSDLHOME'} = $gsdlhome;
     $ENV{'GSDLOS'} = $gsdlos;
+    $ENV{'JAVA_HOME'} = $javahome;
+
     require "$gsdlhome/perllib/util.pm";
 
@@ -345 +364 @@
 }
 
+
 1;