Changeset 23183 for main/trunk

Timestamp:

2010-10-20T13:30:50+13:00 (14 years ago)

Author:

davidb

Message:

With PATH information correctly resolved in gsdlCGI.pm, correct version of incremental-rebuild.pl used.

File:

• main/trunk/greenstone2/cgi-bin/talkback-progressbar.pl (modified) (6 diffs)

main/trunk/greenstone2/cgi-bin/talkback-progressbar.pl

@@ -10 +10 @@
 my $gsdl_tmp_dir;
 
-my $debugging_enabled = 1; # if 1, debugging is enabled and deleting files will not happen
+my $debugging_enabled = 0; # if 1, if enabled deleting files will not happen
 
 BEGIN {
@@ -130 +130 @@
     my $fc_filename = get_file_central_filename();
 
+
     if (open(FCOUT,">$fc_filename")) {
     
@@ -137 +138 @@
 
     close(FCOUT);
+
+    
+    # Ensure it can be edited by owner of Greenstone install (if needed)
+    chmod(0777,$fc_filename);
     }
     else {
@@ -169 +174 @@
     # Useful debug to slow down a 'fast' upload
     # Sleep for 10 msecs
-    # select(undef, undef, undef, 0.01);
+    #select(undef, undef, undef, 0.01);
     #select(undef, undef, undef, 0.1);
 }
@@ -243 +248 @@
     else {
     # Remove the zip file once we have unzipped it, since it is an intermediate file only
+    `chmod -R a+rw $import_dir/HASH*`;
     unlink($zip_filename) unless $debugging_enabled;
     }
-
-#    print STDOUT "Content-type:text/plain\n\n";
-#    print STDOUT "cmd = $java_command\n";
-#    print STDOUT "**** $java_output\n";
-
-}
-
+}
+
+
+sub rebuild_collection
+{
+    my ($collect) = @_;
+
+    my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
+##    my $inc_rebuild_pl = &util::filename_cat($bin_script,"incremental-rebuild.pl");
+
+    my $rebuild_cmd = "perl -S incremental-rebuild.pl \"$collect\"";
+
+    my $rebuild_output = `$rebuild_cmd 2>&1`;
+    my $rebuild_status = $?;
+    if ($rebuild_status > 0) {
+    my $report = "Perl rebuild failed: $rebuild_cmd\n--\n";
+    $report .= "$rebuild_output\n";
+    $report .= "Exit status: " . ($rebuild_status / 256) . "\n";
+##  $report .= $gsdl_cgi->check_perl_home();
+
+#   $report .= "PATH = ". $ENV{'PATH'}. "\n";
+
+
+    $gsdl_cgi->generate_error($report);
+    }
+}
 
 sub main { 
@@ -295 +320 @@
 
         unzip_archives_doc($gsdl_cgi,$gsdl_home,$collect_home,$collect,$full_filename);
+        rebuild_collection($collect);
         }