version 1.187, 2003/09/28 00:14:25
|
version 1.189, 2003/09/29 16:09:20
|
Line 577 END
|
Line 577 END
|
$ENV{'form.viewselect'}, |
$ENV{'form.viewselect'}, |
undef,undef,undef, |
undef,undef,undef, |
sort(keys(%Views))); |
sort(keys(%Views))); |
$scrout.=&selectbox('Per page','show', |
$scrout.=&selectbox('Per Page','show', |
$ENV{'form.show'}, |
$ENV{'form.show'}, |
undef,undef,undef, |
undef,undef,undef, |
(10,20,50,100)); |
(10,20,50,100)); |
Line 2038 sub update_count_status {
|
Line 2038 sub update_count_status {
|
sub update_status { |
sub update_status { |
my ($r,$text) = @_; |
my ($r,$text) = @_; |
$text =~ s/\'/\\\'/g; |
$text =~ s/\'/\\\'/g; |
$text=&mt($text); |
|
$r->print |
$r->print |
("<script>document.statusform.status.value = ' $text'</script>\n"); |
("<script>document.statusform.status.value = ' $text'</script>\n"); |
$r->rflush(); |
$r->rflush(); |
Line 2181 END
|
Line 2180 END
|
if (@Servers_to_contact) { |
if (@Servers_to_contact) { |
# Contact one server |
# Contact one server |
my $server = shift(@Servers_to_contact); |
my $server = shift(@Servers_to_contact); |
&update_status($r,'contacting '.$server); |
&update_status($r,&mt('contacting').' '.$server); |
my $reply=&Apache::lonnet::metadata_query($query,$customquery, |
my $reply=&Apache::lonnet::metadata_query($query,$customquery, |
$customshow,[$server]); |
$customshow,[$server]); |
($server) = keys(%$reply); |
($server) = keys(%$reply); |
Line 2193 END
|
Line 2192 END
|
# left to contact. |
# left to contact. |
if (scalar (keys(%Server_status))) { |
if (scalar (keys(%Server_status))) { |
&update_status($r, |
&update_status($r, |
'waiting on '.(join(' ',keys(%Server_status)))); |
&mt('waiting on').' '.(join(' ',keys(%Server_status)))); |
} |
} |
sleep(1); |
sleep(1); |
} |
} |
Line 2210 END
|
Line 2209 END
|
$status=~/^([\.\w]+)$/; |
$status=~/^([\.\w]+)$/; |
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; |
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1; |
if (-e $datafile && ! -e "$datafile.end") { |
if (-e $datafile && ! -e "$datafile.end") { |
&update_status($r,'Receiving results from '.$server); |
&update_status($r,&mt('Receiving results from').' '.$server); |
next; |
next; |
} |
} |
last if ($connection->aborted()); |
last if ($connection->aborted()); |
if (-e "$datafile.end") { |
if (-e "$datafile.end") { |
&update_status($r,'Reading results from '.$server); |
&update_status($r,&mt('Reading results from').' '.$server); |
if (-z "$datafile") { |
if (-z "$datafile") { |
delete($Server_status{$server}); |
delete($Server_status{$server}); |
next; |
next; |
Line 2270 END
|
Line 2269 END
|
&update_seconds($r,$time_remaining); |
&update_seconds($r,$time_remaining); |
} |
} |
} |
} |
&update_status($r,'Search Complete'.$server); |
&update_status($r,&mt('Search Complete').$server); |
&update_seconds($r,0); |
&update_seconds($r,0); |
&Apache::lonmysql::disconnect_from_db(); |
&Apache::lonmysql::disconnect_from_db(); |
# We have run out of time or run out of servers to talk to and |
# We have run out of time or run out of servers to talk to and |