Changeset 13385

Timestamp:

2006-12-01T10:21:30+13:00 (17 years ago)

Author:

mdewsnip

Message:

Added some extra debugging information to the check-installation command.

File:

• trunk/gsdl/cgi-bin/gliserver.pl (modified) (2 diffs)

trunk/gsdl/cgi-bin/gliserver.pl

@@ -220 +220 @@
     my ($gsdl_cgi) = @_;
 
+    my $installation_ok = 1;
+    my $installation_status = "";
+
     # Check that Java is installed and accessible
     my $java = $gsdl_cgi->get_java_path();
@@ -226 +229 @@
     my $java_status = $?;
     if ($java_status < 0) {
-    $gsdl_cgi->generate_error("Java failed -- do you have the Java run-time installed?\n" . $gsdl_cgi->check_java_home());
-    }
-
-    $gsdl_cgi->generate_ok_message("Java found: $java_output\nInstallation OK!");
+    # The Java command failed
+    $installation_status = "Java failed -- do you have the Java run-time installed?\n" . $gsdl_cgi->check_java_home() . "\n";
+    $installation_ok = 0;
+    }
+    else {
+    $installation_status = "Java found: $java_output";
+    }
+
+    # Show the values of some important environment variables
+    $installation_status .= "\n";
+    $installation_status .= "GSDLHOME: " . $ENV{'GSDLHOME'} . "\n";
+    $installation_status .= "GSDLOS: " . $ENV{'GSDLOS'} . "\n";
+    $installation_status .= "PATH: " . $ENV{'PATH'} . "\n";
+
+    if ($installation_ok) {
+    $gsdl_cgi->generate_ok_message($installation_status . "\nInstallation OK!");
+    }
+    else {
+    $gsdl_cgi->generate_error($installation_status);
+    }
 }