version 1.349, 2016/08/04 20:59:22
|
version 1.351, 2016/11/15 20:03:50
|
Line 479 sub setup_basic_search {
|
Line 479 sub setup_basic_search {
|
.&mt('use related words') |
.&mt('use related words') |
.'</label>'; |
.'</label>'; |
|
|
|
my $anydom = 1; |
|
if ($area eq 'res') { |
|
unless (&Apache::lonnet::allowed('bre','/res/') eq 'F') { |
|
$anydom = 0; |
|
} |
|
} |
|
my $singledom; |
|
my ($disabled,$checked); |
|
if ($anydom) { |
|
$singledom = $r->dir_config('lonDefDomain'); |
|
if ($env{'form.domains'} eq $singledom) { |
|
$checked = 1; |
|
} |
|
} else { |
|
$singledom = $env{'user.domain'}; |
|
$disabled = ' disabled="disabled"'; |
|
$checked = 1; |
|
} |
$onlysearchdomain = '<label>' |
$onlysearchdomain = '<label>' |
.&Apache::lonhtmlcommon::checkbox( |
.&Apache::lonhtmlcommon::checkbox( |
'domains', |
'domains',$checked, |
$env{'form.domains'}, |
$singledom,$disabled) |
$r->dir_config('lonDefDomain')) |
|
.' ' |
.' ' |
.&mt('only search domain [_1]' |
.&mt('only search domain [_1]' |
,'<b>'.$r->dir_config('lonDefDomain').'</b>') |
,'<b>'.$singledom.'</b>') |
.'</label>'; |
.'</label>'; |
|
|
$adv_search_link = '<a href="/adm/searchcat?'. |
$adv_search_link = '<a href="/adm/searchcat?'. |
Line 661 function additional_metadata() {
|
Line 678 function additional_metadata() {
|
$env{'form.category'}) |
$env{'form.category'}) |
.&Apache::lonhtmlcommon::row_closure(); |
.&Apache::lonhtmlcommon::row_closure(); |
|
|
$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))) |
my $anydomain = 1; |
.&Apache::loncommon::domain_select('domains', |
if ($env{'form.area'} ne 'portfolio') { |
$env{'form.domains'},1) |
unless (&Apache::lonnet::allowed('bre','/res/')) { |
.&Apache::lonhtmlcommon::row_closure(); |
$anydomain = 0; |
|
} |
|
} |
|
|
|
$scrout .= &Apache::lonhtmlcommon::row_title(&titlefield(&mt('Domains'))); |
|
if ($anydomain) { |
|
$scrout .= &Apache::loncommon::domain_select('domains', |
|
$env{'form.domains'},1); |
|
} else { |
|
$scrout .= &Apache::loncommon::select_dom_form($env{'user.domain'}, |
|
'domains','','','',[$env{'user.domain'}],'',1); |
|
} |
|
$scrout .= &Apache::lonhtmlcommon::row_closure(); |
|
|
# Misc metadata |
# Misc metadata |
if ($env{'form.area'} ne 'portfolio') { |
if ($env{'form.area'} ne 'portfolio') { |
Line 2412 END
|
Line 2441 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 2536 END
|
Line 2566 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; |
} |
} |