Changeset 23523 for main/branches/64_bit_Greenstone/greenstone2/cgi-bin

Timestamp:

2011-01-05T09:18:04+13:00 (13 years ago)

Author:

sjm84

Message:

Merging the latest trunk changes into this branch

Location:

main/branches/64_bit_Greenstone/greenstone2

Files:

• . (modified) (1 prop)
• cgi-bin/talkback-progressbar.pl (modified) (2 diffs)
• cgi-bin/talkback-transfer.pl (modified) (1 diff)

main/branches/64_bit_Greenstone/greenstone2/cgi-bin/talkback-progressbar.pl

@@ -230 +230 @@
     my $jar_dir= &util::filename_cat($gsdl_home, "bin", "java");
     my $java_classpath = &util::filename_cat($jar_dir,"GLIServer.jar");
+
+    if (!-f $java_classpath) {
+    my $progname = $0;
+    $progname =~ s/^.*[\/\\]//;
+    my $mess = "$progname:\nFailed to find $java_classpath\n";
+    $gsdl_cgi->generate_error($mess);
+    }
 
     my $java_args = "\"$zip_filename\" \"$import_dir\"";
@@ -428 +435 @@
 
     my $wait_dots = inc_wait_dots();
-    my $html = "$wait_dots<br>";
+    my $dots_html = "Waiting for transfer: $wait_dots<br>";
 
     my $filename = $gsdl_cgi->param('uploadedfile');
 
+    my $inner_html;
+
     if ((defined $filename) && ($filename ne "")) {
-    $html .= check_status_single_file($filename);
+    $inner_html = check_status_single_file($filename);
     }
     else {
-    $html .= check_status_all();
-    }
+    $inner_html = check_status_all();
+    }
+
+    my $html = ($inner_html ne "") ? $inner_html : $dots_html;
 
     return $html;

main/branches/64_bit_Greenstone/greenstone2/cgi-bin/talkback-transfer.pl

@@ -93 +93 @@
     my $java_classpath = &util::filename_cat($jar_dir,"GLIServer.jar");
 
+    if (!-f $java_classpath) {
+    my $progname = $0;
+    $progname =~ s/^.*[\/\\]//;
+    my $mess = "$progname:\nFailed to find $java_classpath\n";
+    $gsdl_cgi->generate_error($mess);
+    }
+
     my $zip_file = "$collect-$timestamp.zip";
     my $zip_file_path = &util::filename_cat($archive_dir,$zip_file);