version 1.351, 2016/11/15 20:03:50
|
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 687 function additional_metadata() {
|
Line 696 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 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 1899 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 2081 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 2089 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 2400 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}))); |
} |
} |