Changeset 23137

Timestamp:

2010-10-14T23:30:24+13:00 (14 years ago)

Author:

davidb

Message:

Preparation work to support monitoring of multiple files

File:

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

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

@@ -37 +37 @@
     
     my $per = 0; 
-    if($ENV{CONTENT_LENGTH} >  0){ 
+    if ($ENV{CONTENT_LENGTH} > 0) { 
         $per = int(($bytes_read * 100) / $ENV{CONTENT_LENGTH});
     }
@@ -45 +45 @@
     # Useful debug to slow down a 'fast' upload
     # Sleep for 10 msecs
-    #select(undef, undef, undef, 0.01);
+    select(undef, undef, undef, 0.01);
 }
 
@@ -160 +160 @@
 #=====
 
-# accessed from HTML web page through perlAjax 
-
-sub check_status { 
-   
-    my $filename = $gsdl_cgi->param('uploadedfile');
-    $filename =~ s{^(.*)\/}{}; 
-
+
+
+sub inc_wait_dots
+{
     my $wait_filename = &util::filename_cat($gsdl_tmp_dir,"wait.txt");
     open(WIN,"<$wait_filename");
@@ -179 +176 @@
     close(WOUT);
 
-    my $monitor_filename = "$gsdl_tmp_dir/$filename-progress.txt";
+    return $wait_dots;
+}
+
+sub check_status_single_file
+{
+    my ($filename) = @_;
+    $filename =~ s{^(.*)\/}{}; 
+
+    my $monitor_filename = &util::filename_cat($gsdl_tmp_dir,
+                           "$filename-progress.txt");
 
     if (! -f  $monitor_filename ) {
-
-    return $wait_dots;
-    }
-        
-        
+    return "";
+    }
+                
     open my $PROGRESS, '<', $monitor_filename or die $!;
     my $s = do { local $/; <$PROGRESS> };
     close ($PROGRESS); 
     
-    my $small = 300 - ($s * 3); 
-    my $big = $s * 3; 
-   
-    my $r = "$wait_dots ";
-    $r .= '<div style="width:' . $big . 'px;height:10px;background-color:#dddd00;float:left"></div>'; 
-    $r .= '<div style="width:' . $small . 'px;height:10px;background-color:#008000;float:left"></div>';
-    $r .= '<div style="float:left;width: 80px">&nbsp;' . $s . '%</div>'; 
+    my $fgwidth = int($s * 1.5); 
+    my $bgwidth = 150 - $fgwidth;
+  
+    my $fgcol = "background-color:#dddd00;";
+    my $bgcol = "background-color:#008000;";
+
+    my $style_base = "height:10px; float:left;";
+
+    my $r = "";
+    $r .= "<div style=\"float:left;\">$filename:</div>";
+    $r .= "<div style=\"width: ${fgwidth}px; $fgcol $style_base\"></div>"; 
+    $r .= "<div style=\"width: ${bgwidth}px; $bgcol $style_base\"></div>";
+    $r .= "<div style=\"float:left; width: 80px\">&nbsp;$s%</div>"; 
+    $r .= "<br>";
 
     return $r; 
-    
-}
-
-
-
+}
+
+
+sub check_status_all
+{
+    my $file_central = &util::filename_cat($gsdl_tmp_dir,"file-central.txt");
+
+    my $html = "";
+
+    if (open my $FC, '<', $file_central) {
+    # Read entire file in all at once
+    my $file_list_str = do { local $/; <$FC> };
+    my @file_list = split(/\n/,$file_list_str);
+
+    foreach my $f (@file_list) {
+        $html .= check_status_single_file($f);
+    }
+
+    close ($FC); 
+    }
+    else {
+    # error
+    $html = "Failed to open $file_central: $!\n";
+    }
+
+    return $html;
+
+}
 
  
+# Accessed from HTML web page through the majic of perlAjax 
+
+sub check_status 
+{    
+
+    my $wait_dots = inc_wait_dots();
+    my $html = "$wait_dots<br>";
+
+    my $filename = $gsdl_cgi->param('uploadedfile');
+    if (defined $filename) {
+    $html .= check_status_single_file($filename);
+    }
+    else {
+    $html .= check_status_all();
+    }
+
+    return $html;
+}