Changeset 11293

Timestamp:

2006-03-01T10:36:17+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added a new "check-installation" command to check that Java is installed correctly.

File:

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

trunk/gsdl/cgi-bin/gliserver.pl

@@ -1 +1 @@
 #!perl -w
-# Need to specify the full path of Perl above on Unix
+# Need to specify the full path of Perl above
 
 
@@ -40 +40 @@
     $gsdl_cgi->delete("cmd");
 
-    # All commands require a username, for locking and authentication
+    # The check-installation command has no arguments
+    if ($cmd eq "check-installation") {
+    &check_installation($gsdl_cgi);
+    return;
+    }
+
+    # All other commands require a username, for locking and authentication
     my $username = $gsdl_cgi->clean_param("un");
     if ((!defined $username) || ($username =~ m/^\s*$/)) {
@@ -194 +200 @@
 
 
+sub check_installation
+{
+    my ($gsdl_cgi) = @_;
+
+    # Check that Java is installed and accessible
+    my $java = $gsdl_cgi->get_java_path();
+    my $java_command = "$java -version 2>&1";
+    my $java_output = `$java_command`;
+    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!");
+}
+
+
 sub delete_collection
 {