version 1.181, 2003/06/17 15:53:56
|
version 1.183, 2003/06/19 13:07:49
|
Line 852 sub get_persistent_form_data {
|
Line 852 sub get_persistent_form_data {
|
# Loop through the keys, looking for 'form.' |
# Loop through the keys, looking for 'form.' |
foreach my $name (keys(%persistent_db)) { |
foreach my $name (keys(%persistent_db)) { |
next if ($name !~ /^form./); |
next if ($name !~ /^form./); |
|
# Kludgification begins! |
|
if ($name eq 'form.domains' && |
|
$ENV{'form.searchmode'} eq 'basic' && |
|
$ENV{'form.phase'} ne 'disp_basic') { |
|
next; |
|
} |
|
# End kludge (hopefully) |
next if (exists($ENV{$name})); |
next if (exists($ENV{$name})); |
my @values = map { |
my @values = map { |
&Apache::lonnet::unescape($_); |
&Apache::lonnet::unescape($_); |
Line 1529 sub parse_basic_search {
|
Line 1536 sub parse_basic_search {
|
$pretty_search_string .= ' '.$pretty_domains_string; |
$pretty_search_string .= ' '.$pretty_domains_string; |
} |
} |
$pretty_search_string .= "<br />\n"; |
$pretty_search_string .= "<br />\n"; |
return ('SELECT * FROM metadata WHERE '.$query,$pretty_search_string, |
my $final_query = 'SELECT * FROM metadata WHERE '.$query; |
|
# &Apache::lonnet::logthis($final_query); |
|
return ($final_query,$pretty_search_string, |
$libraries_to_query); |
$libraries_to_query); |
} |
} |
|
|
Line 2163 END
|
Line 2172 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); |
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); |
$Server_status{$server} = $reply->{$server}; |
$Server_status{$server} = $reply->{$server}; |
&update_status($r,'contacting '.$server); |
|
} else { |
} else { |
# wait a sec. to give time for files to be written |
# wait a sec. to give time for files to be written |
# This sleep statement is here instead of outside the else |
# This sleep statement is here instead of outside the else |
# block because we do not want to pause if we have servers |
# block because we do not want to pause if we have servers |
# left to contact. |
# left to contact. |
|
if (scalar (keys(%Server_status))) { |
|
&update_status($r, |
|
'waiting on '.(join(' ',keys(%Server_status)))); |
|
} |
sleep(1); |
sleep(1); |
} |
} |
# |
# |
if (scalar (keys(%Server_status))) { |
|
&update_status($r,'waiting on '.(join(' ',keys(%Server_status)))); |
|
} |
|
# |
# |
# Loop through the servers we have contacted but do not |
# Loop through the servers we have contacted but do not |
# have results from yet, looking for results. |
# have results from yet, looking for results. |