version 1.347, 2015/06/18 15:10:52
|
version 1.355, 2022/05/29 03:19:00
|
Line 178 sub handler {
|
Line 178 sub handler {
|
if (@allowed_searches ==2) { |
if (@allowed_searches ==2) { |
$crumb_text = 'Portfolio and Catalog Search'; |
$crumb_text = 'Portfolio and Catalog Search'; |
} |
} |
|
my $target = '_top'; |
|
if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || |
|
(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) { |
|
if ($env{'form.phase'} =~ /^(sort|run_search)$/) { |
|
$target = '_parent'; |
|
} else { |
|
$target = ''; |
|
} |
|
} |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>'/adm/searchcat?'. |
({href=>'/adm/searchcat?'. |
&Apache::loncommon::inhibit_menu_check(). |
&Apache::loncommon::inhibit_menu_check(). |
Line 185 sub handler {
|
Line 194 sub handler {
|
'&launch='.$env{'form.launch'}. |
'&launch='.$env{'form.launch'}. |
'&mode='.$env{'form.mode'}, |
'&mode='.$env{'form.mode'}, |
text=>"$crumb_text", |
text=>"$crumb_text", |
target=>'_top', |
target=>$target, |
bug=>'Searching',}); |
bug=>'Searching',}); |
# |
# |
if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) { |
if ($env{'form.phase'} !~ m/(basic|adv|course)_search/) { |
Line 479 sub setup_basic_search {
|
Line 488 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 687 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) { |
|
my $defdom = &Apache::lonnet::default_login_domain(); |
|
my ($trusted,$untrusted) = &Apache::lonnet::trusted_domains('shared',$defdom); |
|
$scrout .= &Apache::loncommon::domain_select('domains', |
|
$env{'form.domains'},1,$trusted,$untrusted); |
|
} 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 1852 sub build_date_queries {
|
Line 1892 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 1870 sub build_date_queries {
|
Line 1912 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 1912 sub copyright_check {
|
Line 1956 sub copyright_check {
|
my (undef,undef,$resdom,$resname) = split('/', |
my (undef,undef,$resdom,$resname) = split('/', |
$Metadata->{'url'}); |
$Metadata->{'url'}); |
# Check for priv |
# Check for priv |
if (($Metadata->{'copyright'} eq 'priv') && |
if ($Metadata->{'copyright'} eq 'priv') { |
(($env{'user.name'} ne $resname) && |
unless (($env{'user.name'} eq $resname) && |
($env{'user.domain'} ne $resdom))) { |
($env{'user.domain'} eq $resdom)) { |
return 0; |
return 0; |
|
} |
} |
} |
# Check for domain |
# Check for domain |
if (($Metadata->{'copyright'} eq 'domain') && |
if (($Metadata->{'copyright'} eq 'domain') && |
Line 2051 sub print_sort_form {
|
Line 2096 sub print_sort_form {
|
&Apache::lonnet::logthis(&Apache::lonmysql::get_error()); |
&Apache::lonnet::logthis(&Apache::lonmysql::get_error()); |
return; |
return; |
} |
} |
my $start_page = &Apache::loncommon::start_page('Results',undef); |
my $target = '_top'; |
|
my $args; |
|
if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || |
|
(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) { |
|
$target = '_parent'; |
|
$args = {'links_target' => $target}; |
|
} |
|
my $start_page = &Apache::loncommon::start_page('Results',undef,$args); |
my $breadcrumbs= |
my $breadcrumbs= |
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching', |
&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching', |
$env{'form.catalogmode'} ne 'import'); |
$env{'form.catalogmode'} ne 'import'); |
Line 2059 sub print_sort_form {
|
Line 2111 sub print_sort_form {
|
my $result = <<END; |
my $result = <<END; |
$start_page |
$start_page |
$breadcrumbs |
$breadcrumbs |
<form name="statusform" action="" method="post" target="_top"> |
<form name="statusform" action="" method="post" target="$target"> |
<input type="hidden" name="catalogmode" value="import" /> |
<input type="hidden" name="catalogmode" value="import" /> |
<input type="hidden" name="acts" value="" /> |
<input type="hidden" name="acts" value="" /> |
END |
END |
Line 2370 END
|
Line 2422 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 2411 END
|
Line 2461 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 2535 END
|
Line 2586 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; |
} |
} |
Line 3527 sub display_url {
|
Line 3580 sub display_url {
|
} elsif ($url=~m{^(http://|/uploaded/)}) { |
} elsif ($url=~m{^(http://|/uploaded/)}) { |
$link='<span class="LC_filename">'.$url.'</span>'; |
$link='<span class="LC_filename">'.$url.'</span>'; |
} else { |
} else { |
|
# replace the links to open in a new window |
|
# (because the search opens in a new window, it gets |
|
# confusing when the links open a tab in the |
|
# parent window; ideally we should not force windows) |
|
my $onclick = " onclick=\"window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;\""; |
$link=&Apache::lonhtmlcommon::crumbs( |
$link=&Apache::lonhtmlcommon::crumbs( |
$url, |
$url, |
'preview', |
'preview', |
'', |
'', |
'', |
'', |
$skiplast).' '; |
$skiplast,$onclick).' '; |
# replace the links to open in a new window |
|
# (because the search opens in a new window, it gets |
|
# confusing when the links open a tab in the |
|
# parent window; ideally we should not force windows) |
|
$link =~ s/(href="[^"]*")/\1 onclick="window.open(this.href, '_blank', 'toolbar=1,location=1,menubar=0');return false;"/g; |
|
} |
} |
return $link; |
return $link; |
} |
} |