Changeset 16326

Timestamp:

2008-07-10T11:15:53+12:00 (15 years ago)

Author:

ak19

Message:

Calls to execute java nested inside quotes in case the path to java contains spaces. This now works on Windows.

File:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) (10 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl

@@ -211 +211 @@
     my $java_args = &util::filename_cat($gsdl3srchome, "web", "sites", $site, "etc", "usersDB");
     $gsdl_cgi->checked_chdir($java_args);
-    my $java_command="$java -classpath \"$java_classpath\" org.greenstone.gsdl3.util.usersDB2txt \"$java_args\" 2>&1";
+    my $java_command="\"$java\" -classpath \"$java_classpath\" org.greenstone.gsdl3.util.usersDB2txt \"$java_args\" 2>&1";
     $users_db_content = `$java_command`;
     }
@@ -347 +347 @@
     # Check that Java is installed and accessible
     my $java = $gsdl_cgi->get_java_path();
-    my $java_command = "$java -version 2>&1";
-
+    my $java_command = "\"$java\" -version 2>&1";
+    
     # IIS 6: redirecting output from STDERR to STDOUT just doesn't work, so we have to let it go
     #   directly out to the page
     if($iis6_mode && $gsdl_cgi->greenstone_version() == 2) { ##
     print STDOUT "Content-type:text/plain\n\n";
-    $java_command = "java -version";
+    $java_command = "\"$java\" -version";
     }
 
     my $java_output = `$java_command`;
+        
     my $java_status = $?;
     if ($java_status < 0) {
@@ -372 +373 @@
     $installation_status .= "GSDLHOME: " . $ENV{'GSDLHOME'} . "\n";
     $installation_status .= "GSDLOS: " . $ENV{'GSDLOS'} . "\n";
+    $installation_status .= "JAVA_HOME: " . $ENV{'JAVA_HOME'} . "\n" if defined($ENV{'JAVA_HOME'}); # on GS2, Java's only on the PATH
     $installation_status .= "PATH: " . $ENV{'PATH'} . "\n";
-
+    
 
     if ($installation_ok) { ## M. Dewsnip's svn log comment stated that for iis6_mode output needs to go to STDOUT
@@ -509 +511 @@
     $java_args .= " gsdl3"; ## must this be done elsewhere as well?
     }
-    my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionShell $java_args"; 
 
     my $java_output = `$java_command`;
@@ -555 +557 @@
     my $zip_file_path = &util::filename_cat($collect_directory, $collection . "-archives-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$collection\"";
-    my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionArchives $java_args"; 
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionArchives $java_args"; 
 
     my $java_output = `$java_command`;
@@ -589 +591 @@
     my $zip_file_path = &util::filename_cat($collect_directory, "collection-configurations-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collect_directory\" \"$username\" \"$user_groups\"";
-    my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args"; 
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipCollectionConfigurations $java_args"; 
     my $java_output = `$java_command`;
     my $java_status = $?;
@@ -675 +677 @@
     my $zip_file_path = &util::filename_cat($collection_directory, $collection . "-file-" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$collection_directory\" \"$file\"";
-    my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
 
     my $java_output = `$java_command`;
@@ -724 +726 @@
     my $zip_file_path = &util::filename_cat($web_inf_directory, "webxml" . $timestamp . ".zip");
     my $java_args = "\"$zip_file_path\" \"$web_inf_directory\" \"$file\"";
-    my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.ZipFiles $java_args"; 
     my $java_output = `$java_command`;
 
@@ -989 +991 @@
     if (($script eq "import.pl") || ($script eq "buildcol.pl") || ($script eq "mkcol.pl")) { # || ($script eq "schedule.pl")
     my $collect_directory = $gsdl_cgi->get_collection_dir($site); 
-    ## previously only done for GS3, now it will do this for GS2 too. Is this how it should be?
     $perl_args = $perl_args . " -collectdir " . $collect_directory;
     }
@@ -1117 +1118 @@
     my $java_classpath = &util::filename_cat($ENV{'GSDLHOME'}, "bin", "java", "GLIServer.jar");
     my $java_args = "\"$file_path\" \"$directory_path\"";
-    my $java_command = "$java -classpath \"$java_classpath\" org.greenstone.gatherer.remote.Unzip $java_args"; 
+    my $java_command = "\"$java\" -classpath \"$java_classpath\" org.greenstone.gatherer.remote.Unzip $java_args"; 
 
     my $java_output = `$java_command`;