--- loncom/interface/lonhtmlcommon.pm 2004/02/12 22:23:30 1.46
+++ loncom/interface/lonhtmlcommon.pm 2004/02/13 21:12:12 1.47
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common html routines
#
-# $Id: lonhtmlcommon.pm,v 1.46 2004/02/12 22:23:30 matthew Exp $
+# $Id: lonhtmlcommon.pm,v 1.47 2004/02/13 21:12:12 sakharuk Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -56,6 +56,7 @@ html.
package Apache::lonhtmlcommon;
use Time::Local;
+use Time::HiRes;
use Apache::lonlocal;
use strict;
@@ -629,19 +630,35 @@ sub Create_PrgWin {
my ($r, $title, $heading, $number_to_do)=@_;
#the whole function called through timeout is due to issues
#in mozilla Read BUG #2665 if you want to know the whole story
- $r->print('");
+ if ($r ne '') {
+ $r->print('");
+ } else {
+ print('");
+ }
my %prog_state;
$prog_state{'done'}=0;
@@ -649,17 +666,22 @@ sub Create_PrgWin {
$prog_state{'laststart'}=&Time::HiRes::time();
$prog_state{'max'}=$number_to_do;
- $r->rflush();
+ if ($r ne '') {$r->rflush();}
return %prog_state;
}
# update progress
sub Update_PrgWin {
my ($r,$prog_state,$displayString)=@_;
- $r->print('');
+ } else {
+ print('');
+ }
$$prog_state{'laststart'}=&Time::HiRes::time();
- $r->rflush();
+ if ($r ne '') {$r->rflush();}
}
# increment progress state
@@ -707,19 +729,29 @@ sub Increment_PrgWin {
if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
$lasttime = '';
}
- $r->print('');
+ } else {
+ print('');
+ }
$$prog_state{'laststart'}=&Time::HiRes::time();
- $r->rflush();
+ if ($r ne '') {$r->rflush();}
}
# close Progress Line
sub Close_PrgWin {
my ($r,$prog_state)=@_;
- $r->print(''."\n");
+ if ($r ne '') {
+ $r->print(''."\n");
+ } else {
+ print(''."\n");
+ }
undef(%$prog_state);
- $r->rflush();
+ if ($r ne '') {$r->rflush();}
}