version 1.47, 2004/02/13 21:12:12
|
version 1.48, 2004/02/16 21:49:16
|
Line 630 sub Create_PrgWin {
|
Line 630 sub Create_PrgWin {
|
my ($r, $title, $heading, $number_to_do)=@_; |
my ($r, $title, $heading, $number_to_do)=@_; |
#the whole function called through timeout is due to issues |
#the whole function called through timeout is due to issues |
#in mozilla Read BUG #2665 if you want to know the whole story |
#in mozilla Read BUG #2665 if you want to know the whole story |
if ($r ne '') { |
&r_print($r,'<script>'. |
$r->print('<script>'. |
"var popwin; |
"var popwin; |
function openpopwin () { |
function openpopwin () { |
popwin=open(\'\',\'popwin\',\'width=400,height=100\');". |
popwin=open(\'\',\'popwin\',\'width=400,height=100\');". |
"popwin.document.writeln(\'<html><head><title>$title</title></head>". |
"popwin.document.writeln(\'<html><head><title>$title</title></head>". |
"<body bgcolor=\"#88DDFF\">". |
"<body bgcolor=\"#88DDFF\">". |
"<h4>$heading</h4>". |
"<h4>$heading</h4>". |
"<form name=popremain>". |
"<form name=popremain>". |
'<input type="text" size="55" name="remaining" value="'. |
'<input type="text" size="55" name="remaining" value="'. |
&mt('Starting').'"></form>'. |
&mt('Starting').'"></form>'. |
"</body></html>\');". |
"</body></html>\');". |
"popwin.document.close();}". |
"popwin.document.close();}". |
"\nwindow.setTimeout(openpopwin,0)</script>"); |
"\nwindow.setTimeout(openpopwin,0)</script>"); |
|
} else { |
|
print('<script>'. |
|
"var popwin; |
|
function openpopwin () { |
|
popwin=open(\'\',\'popwin\',\'width=400,height=100\');". |
|
"popwin.document.writeln(\'<html><head><title>$title</title></head>". |
|
"<body bgcolor=\"#88DDFF\">". |
|
"<h4>$heading</h4>". |
|
"<form name=popremain>". |
|
'<input type="text" size="55" name="remaining" value="'. |
|
&mt('Starting').'"></form>'. |
|
"</body></html>\');". |
|
"popwin.document.close();}". |
|
"\nwindow.setTimeout(openpopwin,0)</script>"); |
|
} |
|
|
|
my %prog_state; |
my %prog_state; |
$prog_state{'done'}=0; |
$prog_state{'done'}=0; |
Line 666 sub Create_PrgWin {
|
Line 650 sub Create_PrgWin {
|
$prog_state{'laststart'}=&Time::HiRes::time(); |
$prog_state{'laststart'}=&Time::HiRes::time(); |
$prog_state{'max'}=$number_to_do; |
$prog_state{'max'}=$number_to_do; |
|
|
if ($r ne '') {$r->rflush();} |
|
return %prog_state; |
return %prog_state; |
} |
} |
|
|
# update progress |
# update progress |
sub Update_PrgWin { |
sub Update_PrgWin { |
my ($r,$prog_state,$displayString)=@_; |
my ($r,$prog_state,$displayString)=@_; |
if ($r ne '') { |
&r_print($r,'<script>popwin.document.popremain.remaining.value="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$displayString.'";</script>'); |
$displayString.'";</script>'); |
|
} else { |
|
print('<script>popwin.document.popremain.remaining.value="'. |
|
$displayString.'";</script>'); |
|
} |
|
$$prog_state{'laststart'}=&Time::HiRes::time(); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
if ($r ne '') {$r->rflush();} |
|
} |
} |
|
|
# increment progress state |
# increment progress state |
Line 729 sub Increment_PrgWin {
|
Line 706 sub Increment_PrgWin {
|
if ($user_browser eq 'explorer' && $user_os =~ 'mac') { |
if ($user_browser eq 'explorer' && $user_os =~ 'mac') { |
$lasttime = ''; |
$lasttime = ''; |
} |
} |
if ($r ne '') { |
&r_print($r,'<script>popwin.document.popremain.remaining.value="'. |
$r->print('<script>popwin.document.popremain.remaining.value="'. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>'); |
': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>'); |
|
} else { |
|
print('<script>popwin.document.popremain.remaining.value="'. |
|
$$prog_state{'done'}.'/'.$$prog_state{'max'}. |
|
': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.'</script>'); |
|
} |
|
$$prog_state{'laststart'}=&Time::HiRes::time(); |
$$prog_state{'laststart'}=&Time::HiRes::time(); |
if ($r ne '') {$r->rflush();} |
|
} |
} |
|
|
# close Progress Line |
# close Progress Line |
sub Close_PrgWin { |
sub Close_PrgWin { |
my ($r,$prog_state)=@_; |
my ($r,$prog_state)=@_; |
if ($r ne '') { |
&r_print($r,'<script>popwin.close()</script>'."\n"); |
$r->print('<script>popwin.close()</script>'."\n"); |
|
} else { |
|
print('<script>popwin.close()</script>'."\n"); |
|
} |
|
undef(%$prog_state); |
undef(%$prog_state); |
if ($r ne '') {$r->rflush();} |
|
} |
} |
|
|
|
sub r_print { |
|
my ($r,$to_print)=@_; |
|
if ($r) { |
|
$r->print($to_print); |
|
$r->rflush(); |
|
} else { |
|
print($to_print); |
|
} |
|
} |
|
|
# ------------------------------------------------------- Puts directory header |
# ------------------------------------------------------- Puts directory header |
|
|