Changeset 10584

Timestamp:

2005-08-30T12:04:32+12:00 (19 years ago)

Author:

mdewsnip

Message:

Changed the JAVA_HOME warning so it is only displayed if something goes wrong.

Location:

trunk/gsdl/cgi-bin

Files:

• download (modified) (2 diffs)
• gsdlCGI.pm (modified) (1 diff)
• upload (modified) (2 diffs)

trunk/gsdl/cgi-bin/download

@@ -55 +55 @@
     }
     
-    my $java = $gsdl_cgi->check_for_java();
+    my $java = $gsdl_cgi->get_java_path();
 
     my $classpath 
@@ -70 +70 @@
     $status = $status/256;
     my $exit_status = "Exit status: $status\n";
-    my $mess = "Java failed: $java_cmd\n--\n$java_output\n$exit_status";
+    my $mess = "Java failed: $java_cmd\n--\n$java_output\n$exit_status\n" . $gsdl_cgi->check_java_home();
     $gsdl_cgi->generate_error($mess);
     }

trunk/gsdl/cgi-bin/gsdlCGI.pm

@@ -252 +252 @@
 
 
-
-sub check_for_java()
-{
-    my $self = shift @_;
-
-    my $java = "java";
-
+sub get_java_path()
+{
+    # Check the JAVA_HOME environment variable first
     if (defined $ENV{'JAVA_HOME'}) {
     my $java_home = $ENV{'JAVA_HOME'};
-    # Unix specific
-    $java_home =~ s/\/$//; # remove trailing slash if present
-
-    $java = &util::filename_cat($java_home,"bin","java");
-    }
-    else {
-    my $path = $ENV{'PATH'};
-    my $mess = "JAVA_HOME environment variable not set.  Might not be able to find java unless in PATH=$path";
-
-    $self->generate_warning($mess);
-    }
-    
-    return $java;
+    $java_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific)
+    return &util::filename_cat($java_home, "bin", "java");
+    }
+
+    # Hope that Java is on the PATH
+    return "java";
+}
+
+
+sub check_java_home()
+{
+    # Return a warning unless the JAVA_HOME enrivonmen variable is set
+    if (!defined $ENV{'JAVA_HOME'}) {
+    return "JAVA_HOME environment variable not set. Might not be able to find Java unless in PATH (" . $ENV{'PATH'} . ")";
+    }
+
+    return "";
 }
 

trunk/gsdl/cgi-bin/upload

@@ -90 +90 @@
     close(ZOUT);
 
-    my $java = $gsdl_cgi->check_for_java();
+    my $java = $gsdl_cgi->get_java_path();
 
     my $classpath = &util::filename_cat($gsdlhome,"bin","java",
@@ -106 +106 @@
         $status = $status/256;
         my $exit_status = "Exit status: $status\n";
-        my $mess = "Java failed: $java_cmd\n--\n$java_output\n$exit_status";
+        my $mess = "Java failed: $java_cmd\n--\n$java_output\n$exit_status\n" . $gsdl_cgi->check_java_home();
         $gsdl_cgi->generate_error($mess);
     }