version 1.355, 2022/05/29 03:19:00
|
version 1.356, 2022/05/29 20:45:41
|
Line 184 sub handler {
|
Line 184 sub handler {
|
if ($env{'form.phase'} =~ /^(sort|run_search)$/) { |
if ($env{'form.phase'} =~ /^(sort|run_search)$/) { |
$target = '_parent'; |
$target = '_parent'; |
} else { |
} else { |
$target = ''; |
$target = '_self'; |
} |
} |
} |
} |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
Line 337 END
|
Line 337 END
|
['query','customquery','customshow', |
['query','customquery','customshow', |
'libraries','pretty_string','domains']); |
'libraries','pretty_string','domains']); |
if ($env{'form.phase'} eq 'sort') { |
if ($env{'form.phase'} eq 'sort') { |
&print_sort_form($r,$pretty_string); |
&print_sort_form($r,$pretty_string,$target); |
} elsif ($env{'form.phase'} eq 'run_search') { |
} elsif ($env{'form.phase'} eq 'run_search') { |
&run_search($r,$query,$customquery,$customshow, |
&run_search($r,$query,$customquery,$customshow, |
$libraries,$pretty_string,$env{'form.area'},$domainsref); |
$libraries,$pretty_string,$env{'form.area'},$domainsref,$target); |
} |
} |
} elsif(($env{'form.phase'} eq 'basic_search') || |
} elsif(($env{'form.phase'} eq 'basic_search') || |
($env{'form.phase'} eq 'adv_search')) { |
($env{'form.phase'} eq 'adv_search')) { |
Line 2063 a link to change the search query.
|
Line 2063 a link to change the search query.
|
###################################################################### |
###################################################################### |
###################################################################### |
###################################################################### |
sub print_sort_form { |
sub print_sort_form { |
my ($r,$pretty_query_string) = @_; |
my ($r,$pretty_query_string,$target) = @_; |
|
|
## |
## |
my %SortableFields=&Apache::lonlocal::texthash( |
my %SortableFields=&Apache::lonlocal::texthash( |
Line 2096 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 $target = '_top'; |
|
my $args; |
my $args; |
if ((($env{'request.lti.login'}) && ($env{'request.lti.target'} eq 'iframe')) || |
if ($target eq '_parent') { |
(($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self'))) { |
|
$target = '_parent'; |
|
$args = {'links_target' => $target}; |
$args = {'links_target' => $target}; |
} |
} |
my $start_page = &Apache::loncommon::start_page('Results',undef,$args); |
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', |
|
'','','','','','',$target); |
|
|
my $result = <<END; |
my $result = <<END; |
$start_page |
$start_page |
Line 2362 results into MySQL.
|
Line 2360 results into MySQL.
|
###################################################################### |
###################################################################### |
sub run_search { |
sub run_search { |
my ($r,$query,$customquery,$customshow,$serverlist, |
my ($r,$query,$customquery,$customshow,$serverlist, |
$pretty_string,$area,$domainsref) = @_; |
$pretty_string,$area,$domainsref,$target) = @_; |
my $tabletype = 'metadata'; |
my $tabletype = 'metadata'; |
if ($area eq 'portfolio') { |
if ($area eq 'portfolio') { |
$tabletype = 'portfolio_search'; |
$tabletype = 'portfolio_search'; |
Line 2371 sub run_search {
|
Line 2369 sub run_search {
|
# |
# |
# Print run_search header |
# Print run_search header |
# |
# |
my $start_page = &Apache::loncommon::start_page('Search Status',undef); |
my $args; |
|
if ($target eq '_parent') { |
|
$args = {'links_target' => $target}; |
|
} |
|
my $start_page = &Apache::loncommon::start_page('Search Status',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', |
|
'','','','','','',$target); |
$r->print(<<END); |
$r->print(<<END); |
$start_page |
$start_page |
$breadcrumbs |
$breadcrumbs |