version 1.350, 2016/11/09 01:11:04
|
version 1.354, 2020/08/26 00:42:39
|
Line 687 function additional_metadata() {
|
Line 687 function additional_metadata() {
|
|
|
$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))); |
$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))); |
if ($anydomain) { |
if ($anydomain) { |
|
my $defdom = &Apache::lonnet::default_login_domain(); |
|
my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom); |
$scrout .= &Apache::loncommon::domain_select('domains', |
$scrout .= &Apache::loncommon::domain_select('domains', |
$env{'form.domains'},1); |
$env{'form.domains'},1,$trusted,$untrusted); |
} else { |
} else { |
$scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'}, |
$scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'}, |
'domains','','','',[$env{'user.domain'}],'',1); |
'domains','','','',[$env{'user.domain'}],'',1); |
Line 1881 sub build_date_queries {
|
Line 1883 sub build_date_queries {
|
my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore); |
my (undef,undef,undef,$cbday,$cbmon,$cbyear) = localtime($cbefore); |
# Correct for year being relative to 1900 |
# Correct for year being relative to 1900 |
$cayear+=1900; $cbyear+=1900; |
$cayear+=1900; $cbyear+=1900; |
|
# Correct month; localtime gives month 0..11 but MySQL expects 1..12 |
|
$camon++; $cbmon++; |
my $cquery= |
my $cquery= |
'(creationdate BETWEEN '. |
'(creationdate BETWEEN '. |
"'".$cayear.'-'.$camon.'-'.$caday."'". |
"'".$cayear.'-'.$camon.'-'.$caday."'". |
Line 1899 sub build_date_queries {
|
Line 1903 sub build_date_queries {
|
my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore); |
my (undef,undef,undef,$mbday,$mbmon,$mbyear) = localtime($mbefore); |
# Correct for year being relative to 1900 |
# Correct for year being relative to 1900 |
$mayear+=1900; $mbyear+=1900; |
$mayear+=1900; $mbyear+=1900; |
|
# Correct month; localtime gives month 0..11 but MySQL expects 1..12 |
|
$mamon++; $mbmon++; |
my $mquery= |
my $mquery= |
'(lastrevisiondate BETWEEN '. |
'(lastrevisiondate BETWEEN '. |
"'".$mayear.'-'.$mamon.'-'.$maday."'". |
"'".$mayear.'-'.$mamon.'-'.$maday."'". |
Line 2400 END
|
Line 2406 END
|
%all_library_servers = (%library_servers,%older_library_servers); |
%all_library_servers = (%library_servers,%older_library_servers); |
@Servers_to_contact = sort(keys(%all_library_servers)); |
@Servers_to_contact = sort(keys(%all_library_servers)); |
foreach my $server (@Servers_to_contact) { |
foreach my $server (@Servers_to_contact) { |
my %possdoms; |
|
map { $possdoms{$_}=1; } &Apache::lonnet::machine_domains($all_library_servers{$server}); |
|
$domains_by_server{$server} = |
$domains_by_server{$server} = |
join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server}))); |
join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server}))); |
} |
} |
Line 2441 END
|
Line 2445 END
|
## Prepare for the big loop. |
## Prepare for the big loop. |
my $hitcountsum; |
my $hitcountsum; |
my $oldhitcountsum; |
my $oldhitcountsum; |
|
my $displaycount; |
my %matches; |
my %matches; |
my $server; |
my $server; |
my $status; |
my $status; |
Line 2565 END
|
Line 2570 END
|
last if ($connection->aborted()); |
last if ($connection->aborted()); |
if ($oldhitcountsum < $hitcountsum) { |
if ($oldhitcountsum < $hitcountsum) { |
&update_count_status($r,$hitcountsum); |
&update_count_status($r,$hitcountsum); |
if ($hitcountsum <= $env{'form.show'}) { |
if (($hitcountsum <= $env{'form.show'}) || |
|
(!$displaycount && $hitcountsum)) { |
reload_result_frame($r); |
reload_result_frame($r); |
|
$displaycount = $hitcountsum; |
} |
} |
$oldhitcountsum = $hitcountsum; |
$oldhitcountsum = $hitcountsum; |
} |
} |