version 1.15, 2003/03/03 22:00:03
|
version 1.16, 2003/03/07 19:09:11
|
Line 653 sub Create_PrgWin {
|
Line 653 sub Create_PrgWin {
|
"</script>"); |
"</script>"); |
|
|
my %prog_state; |
my %prog_state; |
$prog_state{'now'}=0; |
$prog_state{'done'}=0; |
$prog_state{'since'}=time; |
$prog_state{'firststart'}=time; |
$prog_state{'started'}=time; |
$prog_state{'laststart'}=time; |
$prog_state{'total'}=$number_to_do; |
$prog_state{'max'}=$number_to_do; |
|
|
$r->rflush(); |
$r->rflush(); |
return %prog_state; |
return %prog_state; |
Line 667 sub Update_PrgWin {
|
Line 667 sub Update_PrgWin {
|
my ($r,$prog_state,$displayString)=@_; |
my ($r,$prog_state,$displayString)=@_; |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$displayString.'";</script>'); |
$displayString.'";</script>'); |
$$prog_state{'started'}=time; |
$$prog_state{'laststart'}=time; |
$r->rflush(); |
$r->rflush(); |
} |
} |
|
|
# increment progress state |
# increment progress state |
sub Increment_PrgWin { |
sub Increment_PrgWin { |
my ($r,$prog_state,$extraInfo)=@_; |
my ($r,$prog_state,$extraInfo)=@_; |
$$prog_state{'now'}++; |
$$prog_state{'done'}++; |
|
my $time_est= (time - $$prog_state{'firststart'})/$$prog_state{'done'} * |
|
($$prog_state{'max'}-$$prog_state{'done'}); |
|
$time_est = int($time_est); |
|
if (int ($time_est/60) > 0) { |
|
my $min = int($time_est/60); |
|
my $sec = $time_est % 60; |
|
$time_est = $min.' minutes'; |
|
if ($sec > 1) { |
|
$time_est.= ', '.$sec.' seconds'; |
|
} elsif ($sec > 0) { |
|
$time_est.= ', '.$sec.' second'; |
|
} |
|
} else { |
|
$time_est .= ' seconds'; |
|
} |
|
|
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$$prog_state{'now'}.'/'.$$prog_state{'total'}. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
': '.int((time-$$prog_state{'since'})/ |
': '.$time_est.' remaining ('.(time-$$prog_state{'laststart'}). |
$$prog_state{'now'}*($$prog_state{'total'}-$$prog_state{'now'})). |
|
' secs remaining ('.(time-$$prog_state{'started'}). |
|
' seconds for '.$extraInfo.')";'.'</script>'); |
' seconds for '.$extraInfo.')";'.'</script>'); |
$$prog_state{'started'}=time; |
$$prog_state{'laststart'}=time; |
$r->rflush(); |
$r->rflush(); |
} |
} |
|
|