loncom/interface/lonsearchcat.pm - diff

Return to lonsearchcat.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.331 and 1.331.4.12

version 1.331, 2011/12/09 01:04:27	version 1.331.4.12, 2016/08/04 21:23:57
Line 52 search (on a server basis) is displayed	Line 52 search (on a server basis) is displayed

=head1 Internals	=head1 Internals

=over 4

=cut	=cut

###############################################################################	###############################################################################
Line 80 use Apache::lonnavmaps;	Line 78 use Apache::lonnavmaps;
use Apache::lonindexer();	use Apache::lonindexer();
use Apache::lonwishlist();	use Apache::lonwishlist();
use LONCAPA;	use LONCAPA;
	use Time::HiRes qw(sleep);

######################################################################	######################################################################
######################################################################	######################################################################
Line 145 sub handler {	Line 144 sub handler {
## this once, so the pause indicator is deleted	## this once, so the pause indicator is deleted
##	##
if (exists($env{'form.pause'})) {	if (exists($env{'form.pause'})) {
sleep(1);	sleep(0.1);
delete($env{'form.pause'});	delete($env{'form.pause'});
}	}
##	##
Line 172 sub handler {	Line 171 sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();	&Apache::lonhtmlcommon::clear_breadcrumbs();

my @allowed_searches = ('portfolio');	my @allowed_searches = ('portfolio');
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
push(@allowed_searches,'res');	push(@allowed_searches,'res');
}	}
my $crumb_text = 'Portfolio Search';	my $crumb_text = 'Portfolio Search';
Line 195 sub handler {	Line 194 sub handler {
&Apache::lonnet::logthis('lonsearchcat:'.	&Apache::lonnet::logthis('lonsearchcat:'.
'Unable to recover data from '.	'Unable to recover data from '.
$persistent_db_file);	$persistent_db_file);
my $msg =	my $msg =
'We were unable to retrieve data describing your search. '.	&mt('We were unable to retrieve data describing your search.').
'This is a serious error and has been logged. '.	' '.&mt('This is a serious error and has been logged.').
'Please alert your LON-CAPA administrator.';	'<br />'.
&Apache::loncommon::simple_error_page($r,'Search Error',	&mt('Please alert your LON-CAPA administrator.');
$msg);	&Apache::loncommon::simple_error_page(
	$r,'Search Error',
	$msg,
	{'no_auto_mt_msg' => 1});
return OK;	return OK;
}	}
}	}
Line 321 END	Line 323 END
&display_results($r,$importbutton,$closebutton,$diropendb,	&display_results($r,$importbutton,$closebutton,$diropendb,
$env{'form.area'});	$env{'form.area'});
} elsif ($env{'form.phase'} =~ /^(sort\|run_search)$/) {	} elsif ($env{'form.phase'} =~ /^(sort\|run_search)$/) {
my ($query,$customquery,$customshow,$libraries,$pretty_string) =	my ($query,$customquery,$customshow,$libraries,$pretty_string,$domainsref) =
&get_persistent_data($persistent_db_file,	&get_persistent_data($persistent_db_file,
['query','customquery','customshow',	['query','customquery','customshow',
'libraries','pretty_string']);	'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);
} 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'});	$libraries,$pretty_string,$env{'form.area'},$domainsref);
}	}
} 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')) {
#	#
# We are running a search, try to parse it	# We are running a search, try to parse it
my ($query,$customquery,$customshow,$libraries) =	my ($query,$customquery,$customshow,$libraries,$domains) =
(undef,undef,undef,undef);	(undef,undef,undef,undef,undef);
my $pretty_string;	my $pretty_string;
if ($env{'form.phase'} eq 'basic_search') {	if ($env{'form.phase'} eq 'basic_search') {
($query,$pretty_string,$libraries) =	($query,$pretty_string,$libraries,$domains) =
&parse_basic_search($r,$closebutton,$hidden_fields);	&parse_basic_search($r,$closebutton,$hidden_fields);
return OK if (! defined($query));	return OK if (! defined($query));
&make_persistent({ basicexp => $env{'form.basicexp'}},	&make_persistent({ basicexp => $env{'form.basicexp'}},
$persistent_db_file);	$persistent_db_file);
} else { # Advanced search	} else { # Advanced search
($query,$customquery,$customshow,$libraries,$pretty_string)	($query,$customquery,$customshow,$libraries,$pretty_string,$domains)
= &parse_advanced_search($r,$closebutton,$hidden_fields);	= &parse_advanced_search($r,$closebutton,$hidden_fields);
return OK if (! defined($query));	return OK if (! defined($query));
}	}
Line 353 END	Line 355 END
customquery => $customquery,	customquery => $customquery,
customshow => $customshow,	customshow => $customshow,
libraries => $libraries,	libraries => $libraries,
pretty_string => $pretty_string },	pretty_string => $pretty_string,
	domains => $domains },
$persistent_db_file);	$persistent_db_file);
#	#
# Set up table	# Set up table
Line 427 sub hidden_field {	Line 430 sub hidden_field {

######################################################################	######################################################################

=pod	=pod

	=over 4

=item &print_basic_search_form()	=item &print_basic_search_form()

Line 445 sub print_basic_search_form {	Line 450 sub print_basic_search_form {
$env{'form.catalogmode'} ne 'import');	$env{'form.catalogmode'} ne 'import');
my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;	my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb;
# Search form for resource space	# Search form for resource space
if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) {	if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') {
$scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);	$scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton);
$scrout .= '<hr /><br />';	$scrout .= '<hr /><br />';
}	}
Line 1012 Outputs: array of values. Returns undef	Line 1017 Outputs: array of values. Returns undef

This function is the reverse of &make_persistent();	This function is the reverse of &make_persistent();
Retrieve persistent data from %persistent_db. Retrieved items will have their	Retrieve persistent data from %persistent_db. Retrieved items will have their
values unescaped. If the item contains commas (before unescaping), the	values unescaped. If the item is 'domains; then the returned
returned value will be an array pointer.	value will be a hash pointer. Otherwise, if the item contains
	commas (before unescaping), the returned value will be an array pointer.

=cut	=cut

Line 1031 sub get_persistent_data {	Line 1037 sub get_persistent_data {
push @Values, undef;	push @Values, undef;
next;	next;
}	}
my @values = map {	if ($name eq 'domains') {
&unescape($_);	my %valueshash;
} split(',',$persistent_db{$name});	my @items= map { &unescape($_); } split(',',$persistent_db{$name});
if (@values <= 1) {	foreach my $item (@items) {
push @Values,$values[0];	if ($item =~ /=/) {
	my ($key,$val) = map { &unescape($_); } split(/=/,$item);
	$valueshash{$key} = $val;
	}
	}
	push(@Values,\%valueshash);
} else {	} else {
push @Values,\@values;	my @values = map {
	&unescape($_);
	} split(',',$persistent_db{$name});
	if (@values <= 1) {
	push @Values,$values[0];
	} else {
	push @Values,\@values;
	}
}	}
}	}
untie (%persistent_db);	untie (%persistent_db);
Line 1055 Inputs: Hash of values to save, filename	Line 1073 Inputs: Hash of values to save, filename

Store variables away to the %persistent_db.	Store variables away to the %persistent_db.
Values will be escaped. Values that are array pointers will have their	Values will be escaped. Values that are array pointers will have their
elements escaped and concatenated in a comma separated string.	elements escaped and concatenated in a comma separated string. Values
	that are hash pointers will have their keys and values escaped and
	concatenated in a comma separated string.

=cut	=cut

Line 1067 sub make_persistent {	Line 1087 sub make_persistent {
return undef if (! tie(%persistent_db,'GDBM_File',	return undef if (! tie(%persistent_db,'GDBM_File',
$filename,&GDBM_WRCREAT(),0640));	$filename,&GDBM_WRCREAT(),0640));
foreach my $name (keys(%save)) {	foreach my $name (keys(%save)) {
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));	my @values=();
# We handle array references, but not recursively.	if (ref($save{$name}) eq 'ARRAY') {
	@values = @{$save{$name}};
	} elsif (ref($save{$name}) eq 'HASH') {
	foreach my $key (%{$save{$name}}) {
	push(@values,&escape($key).'='.&escape($save{$name}{$key}));
	}
	} else {
	@values = $save{$name};
	}
	# We handle array and hash references, but not recursively.
my $store = join(',', map { &escape($_); } @values );	my $store = join(',', map { &escape($_); } @values );
$persistent_db{$name} = $store;	$persistent_db{$name} = $store;
}	}
Line 1385 sub parse_advanced_search {	Line 1414 sub parse_advanced_search {
##	##
## Deal with restrictions to given domains	## Deal with restrictions to given domains
##	##
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions();	my ($libraries_to_query,$pretty_domains_string,$domains_to_query) =
	&parse_domain_restrictions();
if ($pretty_domains_string) {	if ($pretty_domains_string) {
$pretty_search_string .= $pretty_domains_string."<br />\n";	$pretty_search_string .= $pretty_domains_string."<br />\n";
}	}
Line 1401 sub parse_advanced_search {	Line 1431 sub parse_advanced_search {
}	}
#&Apache::lonnet::logthis('advanced query = '.$/.$query);	#&Apache::lonnet::logthis('advanced query = '.$/.$query);
return ($query,$customquery,$customshow,$libraries_to_query,	return ($query,$customquery,$customshow,$libraries_to_query,
$pretty_search_string);	$pretty_search_string,$domains_to_query);
}	}

sub parse_domain_restrictions {	sub parse_domain_restrictions {
my $libraries_to_query = undef;	my $libraries_to_query = undef;
	my $domains_to_query = undef;
# $env{'form.domains'} can be either a scalar or an array reference.	# $env{'form.domains'} can be either a scalar or an array reference.
# We need an array.	# We need an array.
if (! exists($env{'form.domains'}) \|\| $env{'form.domains'} eq '') {	if (! exists($env{'form.domains'}) \|\| $env{'form.domains'} eq '') {
Line 1429 sub parse_domain_restrictions {	Line 1460 sub parse_domain_restrictions {
foreach (sort @allowed_domains) {	foreach (sort @allowed_domains) {
$pretty_domains_string .= "<b>".$_."</b> ";	$pretty_domains_string .= "<b>".$_."</b> ";
}	}
my %servers = &Apache::lonnet::get_unique_servers(\@allowed_domains,	my %library_servers = &Apache::lonnet::get_unique_servers(\@allowed_domains,
'library');	'library');
	my (%older_library_servers,%okdoms,%domains_for_id);
	map { $okdoms{$_} = 1; } @allowed_domains;
	foreach my $key (keys(%library_servers)) {
	if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) {
	my $major = $1;
	my $minor = $2;
	if (($major < 2) \|\| (($major == 2) && ($minor < 11))) {
	map { $older_library_servers{$_} = 1; }
	&Apache::lonnet::machine_ids($library_servers{$key});
	} else {
	my %possdoms;
	map { $possdoms{$_}=1 if ($okdoms{$_}); }
	&Apache::lonnet::machine_domains($library_servers{$key});
	$domains_for_id{$key} = join(',',sort(keys(%possdoms)));
	}
	}
	}
	my %servers = (%library_servers,%older_library_servers);
$libraries_to_query = [keys(%servers)];	$libraries_to_query = [keys(%servers)];
	$domains_to_query = \%domains_for_id;
}	}
return ($libraries_to_query,	return ($libraries_to_query,
$pretty_domains_string);	$pretty_domains_string,
	$domains_to_query);
}	}

######################################################################	######################################################################
Line 1463 sub parse_basic_search {	Line 1514 sub parse_basic_search {
$env{"form.$_"}=&unescape($env{"form.$_"});	$env{"form.$_"}=&unescape($env{"form.$_"});
$env{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;	$env{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
my ($libraries_to_query,$pretty_domains_string) = &parse_domain_restrictions();	my ($libraries_to_query,$pretty_domains_string,$domains_to_query) =
	&parse_domain_restrictions();
#	#
# Check to see if enough of a query is filled in	# Check to see if enough of a query is filled in
my $search_string = $env{'form.basicexp'};	my $search_string = $env{'form.basicexp'};
Line 1509 sub parse_basic_search {	Line 1561 sub parse_basic_search {
$pretty_search_string =~ s:^<br /> and ::;	$pretty_search_string =~ s:^<br /> and ::;
&Apache::lonnet::logthis('simple search final query = '.$/.$final_query);	&Apache::lonnet::logthis('simple search final query = '.$/.$final_query);
return ($final_query,$pretty_search_string,	return ($final_query,$pretty_search_string,
$libraries_to_query);	$libraries_to_query,$domains_to_query);
}	}


Line 1781 sub build_date_queries {	Line 1833 sub build_date_queries {
if ((defined($cafter) && ! defined($cbefore)) \|\|	if ((defined($cafter) && ! defined($cbefore)) \|\|
(defined($cbefore) && ! defined($cafter))) {	(defined($cbefore) && ! defined($cafter))) {
# This is bad, so let them know	# This is bad, so let them know
$error = &mt('Incorrect entry for the creation date. '.	$error = &mt('Incorrect entry for the creation date. '.
'You must specify both the beginning and ending dates.');	'You must specify both the beginning and ending dates.');
}	}
if (! defined($error) &&	if (! defined($error) &&
((defined($mafter) && ! defined($mbefore)) \|\|	((defined($mafter) && ! defined($mbefore)) \|\|
(defined($mbefore) && ! defined($mafter)))) {	(defined($mbefore) && ! defined($mafter)))) {
# This is also bad, so let them know	# This is also bad, so let them know
$error = &mt('Incorrect entry for the last revision date. '.	$error = &mt('Incorrect entry for the last revision date. '.
'You must specify both the beginning and ending dates.');	'You must specify both the beginning and ending dates.');
}	}
if (! defined($error)) {	if (! defined($error)) {
Line 1860 sub copyright_check {	Line 1912 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 1901 sub ensure_db_and_table {	Line 1954 sub ensure_db_and_table {
## Sanity check the table id.	## Sanity check the table id.
##	##
if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {	if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {
$r->print(&Apache::loncommon::start_page(&mt('Error'))	$r->print(&Apache::loncommon::start_page('Error')
. '<p>table: \|'.$table.'\|</p>' # SB
.'<p class="LC_error">'	.'<p class="LC_error">'
.&mt('Unable to retrieve search results. '	.&mt('Unable to retrieve search results. '
.'Unable to determine the table results were saved in.')	.'Unable to determine the table results were saved in.')
	.'</p>'
	. '<p>'.&mt('Internal info:').'</p>'
	.'<pre>'.$table.'</pre>'
.&Apache::loncommon::end_page()	.&Apache::loncommon::end_page()
);	);
return undef;	return undef;
Line 1915 sub ensure_db_and_table {	Line 1970 sub ensure_db_and_table {
##	##
my $connection_result = &Apache::lonmysql::connect_to_db();	my $connection_result = &Apache::lonmysql::connect_to_db();
if (!defined($connection_result)) {	if (!defined($connection_result)) {
$r->print("Unable to connect to the MySQL database where your results".	$r->print(
" are saved.".	'<p class="LC_error">'
&Apache::loncommon::end_page());	.&mt('Unable to connect to the MySQL database where your results are saved.')
	.'</p>'
	.&Apache::loncommon::end_page()
	);
&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".	&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
" connect to database.");	" connect to database.");
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());	&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
Line 1925 sub ensure_db_and_table {	Line 1983 sub ensure_db_and_table {
}	}
my $table_check = &Apache::lonmysql::check_table($table);	my $table_check = &Apache::lonmysql::check_table($table);
if (! defined($table_check)) {	if (! defined($table_check)) {
$r->print("A MySQL error has occurred.</form>".	$r->print(
&Apache::loncommon::end_page());	'<p class="LC_error">'
	.&mt('A MySQL error has occurred.')
	.'</p></form>'
	.&Apache::loncommon::end_page());
&Apache::lonnet::logthis("lonmysql was unable to determine the status".	&Apache::lonnet::logthis("lonmysql was unable to determine the status".
" of table ".$table);	" of table ".$table);
return undef;	return undef;
} elsif (! $table_check) {	} elsif (! $table_check) {
$r->print("The table of results could not be found.");	$r->print(
	'<p class="LC_error">'
	.&mt('The table of results could not be found.')
	.'</p>'
	);
&Apache::lonnet::logthis("The user requested a table, ".$table.	&Apache::lonnet::logthis("The user requested a table, ".$table.
", that could not be found.");	", that could not be found.");
return undef;	return undef;
Line 2001 sub print_sort_form {	Line 2066 sub print_sort_form {
</script>	</script>
END	END

my $start_page = &Apache::loncommon::start_page('Results',$js);	my $start_page = &Apache::loncommon::start_page('Results');
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 2027 END	Line 2092 END
# $result.="</select>\n";	# $result.="</select>\n";
my $revise = &revise_button();	my $revise = &revise_button();
$result.='<p>'	$result.='<p>'
.&mt('There are [_1] matches to your query.',$total_results)	.&mt('Total of [quant,_1,match,matches] to your query.',$total_results)
.' '.$revise.'</p>'	.' '.$revise.'</p>'
.'<p>'.&mt('Search: ').$pretty_query_string	.'<p>'.&mt('Search: ').$pretty_query_string
.'</p></form>';	.'</p></form>';
Line 2165 SCRIPT	Line 2230 SCRIPT
$r->rflush();	$r->rflush();
}	}

	sub reload_result_frame {
	my ($r) = @_;
	my $newloc = '/adm/searchcat?phase=results&persistent_db_id='.
	$env{'form.persistent_db_id'};
	$r->print(<<SCRIPT);
	<script type="text/javascript">
	parent.update_results("$newloc");
	</script>
	SCRIPT

	$r->rflush();
	}

{	{
my $max_time = 300; # seconds for the search to complete	my $max_time = 60; # seconds for the search to complete
my $start_time = 0;	my $start_time = 0;
my $last_time = 0;	my $last_time = 0;

Line 2247 results into MySQL.	Line 2325 results into MySQL.
######################################################################	######################################################################
sub run_search {	sub run_search {
my ($r,$query,$customquery,$customshow,$serverlist,	my ($r,$query,$customquery,$customshow,$serverlist,
$pretty_string,$area) = @_;	$pretty_string,$area,$domainsref) = @_;
my $tabletype = 'metadata';	my $tabletype = 'metadata';
if ($area eq 'portfolio') {	if ($area eq 'portfolio') {
$tabletype = 'portfolio_search';	$tabletype = 'portfolio_search';
Line 2279 END	Line 2357 END
$r->rflush();	$r->rflush();
#	#
# Determine the servers we need to contact.	# Determine the servers we need to contact.
my @Servers_to_contact;	my (@Servers_to_contact,%domains_by_server);
if (defined($serverlist)) {	if (defined($serverlist)) {
if (ref($serverlist) eq 'ARRAY') {	if (ref($serverlist) eq 'ARRAY') {
@Servers_to_contact = @$serverlist;	@Servers_to_contact = @$serverlist;
} else {	} else {
@Servers_to_contact = ($serverlist);	@Servers_to_contact = ($serverlist);
}	}
	if (ref($domainsref) eq 'HASH') {
	foreach my $server (@Servers_to_contact) {
	$domains_by_server{$server} = $domainsref->{$server};
	}
	}
} else {	} else {
my %all_library_servers = &Apache::lonnet::unique_library();	my %library_servers = &Apache::lonnet::unique_library();
	my (%all_library_servers, %older_library_servers);
	foreach my $key (keys(%library_servers)) {
	if (&Apache::lonnet::get_server_loncaparev('',$key) =~ /^\'?(\d+)\.(\d+)/) {
	my $major = $1;
	my $minor = $2;
	if (($major < 2) \|\| (($major == 2) && ($minor < 11))) {
	map { $older_library_servers{$_} = 1; }
	&Apache::lonnet::machine_ids($library_servers{$key});
	}
	}
	}
	%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) {
	my %possdoms;
	map { $possdoms{$_}=1; } &Apache::lonnet::machine_domains($all_library_servers{$server});
	$domains_by_server{$server} =
	join(',',sort(&Apache::lonnet::machine_domains($all_library_servers{$server})));
	}
}	}
my %Server_status;	my %Server_status;
#	#
Line 2324 END	Line 2425 END
##	##
## Prepare for the big loop.	## Prepare for the big loop.
my $hitcountsum;	my $hitcountsum;
	my $oldhitcountsum;
my %matches;	my %matches;
my $server;	my $server;
my $status;	my $status;
Line 2358 END	Line 2460 END
my $server = shift(@Servers_to_contact);	my $server = shift(@Servers_to_contact);
&update_status($r,&mt('contacting [_1]',$server));	&update_status($r,&mt('contacting [_1]',$server));
my $reply=&Apache::lonnet::metadata_query($query,$customquery,	my $reply=&Apache::lonnet::metadata_query($query,$customquery,
$customshow,[$server]);	$customshow,[$server],\%domains_by_server);
($server) = keys(%$reply);	($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};	$Server_status{$server} = $reply->{$server};
} else {	} else {
Line 2370 END	Line 2472 END
&update_status($r,	&update_status($r,
&mt('waiting on [_1]',join(' ',keys(%Server_status))));	&mt('waiting on [_1]',join(' ',keys(%Server_status))));
}	}
sleep(1);	sleep(0.1);
}	}
#	#
# Loop through the servers we have contacted but do not	# Loop through the servers we have contacted but do not
Line 2446 END	Line 2548 END
delete($Server_status{$server});	delete($Server_status{$server});
}	}
last if ($connection->aborted());	last if ($connection->aborted());
&update_count_status($r,$hitcountsum);	if ($oldhitcountsum < $hitcountsum) {
	&update_count_status($r,$hitcountsum);
	if ($hitcountsum <= $env{'form.show'}) {
	reload_result_frame($r);
	}
	$oldhitcountsum = $hitcountsum;
	}
}	}
last if ($connection->aborted());	last if ($connection->aborted());
&update_seconds($r);	&update_seconds($r);
Line 2540 sub display_results {	Line 2648 sub display_results {
if ($env{'form.catalogmode'} eq 'import') {	if ($env{'form.catalogmode'} eq 'import') {
if (! tie(%groupsearch_db,'GDBM_File',$diropendb,	if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
&GDBM_WRCREAT(),0640)) {	&GDBM_WRCREAT(),0640)) {
	# NOTE: this can happen when a previous request to searchcat?phase=results gets interrupted
	# (%groupsearch_db is not untied)
$r->print('<p class="LC_error">'.	$r->print('<p class="LC_error">'.
&mt('Unable to save import results.').	&mt('Unable to save import results.').
'</p>'.	'</p>'.
Line 2547 sub display_results {	Line 2657 sub display_results {
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
$r->rflush();	$r->rflush();
return;	return;
}	}
	# untie %groupsearch_db if the connection gets aborted before the end
	$r->register_cleanup(sub {
	untie %groupsearch_db if (tied(%groupsearch_db));
	});
}	}
##	##
## Prepare the table for querying	## Prepare the table for querying
Line 2689 sub display_results {	Line 2803 sub display_results {
);	);

if ($total_results == 0) {	if ($total_results == 0) {
$r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2" />'.	$r->print('<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
'<p class="LC_info">'.&mt('There are currently no results.').'</p>'.
"</form>".	"</form>".
&Apache::loncommon::end_page());	&Apache::loncommon::end_page());
return;	return;
Line 3063 SCRIPT	Line 3176 SCRIPT
</script>	</script>
SCRIPT	SCRIPT

	$js.=<<SCRIPT;
	<script type="text/javascript">
	\$(document).ready(function() {
	parent.done_loading_results();
	});
	</script>
	SCRIPT

my $start_page = &Apache::loncommon::start_page(undef,$js,	my $start_page = &Apache::loncommon::start_page(undef,$js,
{'only_body' =>1,	{'only_body' =>1,
'add_wishlist' =>1});	'add_wishlist' =>1,
	'add_modal' =>1});
my $result=<<END;	my $result=<<END;
$start_page	$start_page
<form name="results" method="post" action="/adm/searchcat">	<form name="results" method="post" action="/adm/searchcat">
Line 3095 sub print_frames_interface {	Line 3217 sub print_frames_interface {
// <![CDATA[	// <![CDATA[
var targetwin = opener;	var targetwin = opener;
var queue = '';	var queue = '';

	var loading_results = true;
	var need_reloading = false;
	var new_location;
	function update_results(newloc) {
	if (loading_results) {
	need_reloading = true;
	new_location = newloc;
	} else {
	loading_results = true;
	resultsframe.location = newloc;
	}
	}
	function done_loading_results() {
	loading_results = false;
	if (need_reloading) {
	need_reloading = false;
	update_results(new_location);
	}
	}
// ]]>	// ]]>
</script>	</script>
JS	JS
Line 3157 sub evalfields {	Line 3299 sub evalfields {
######################################################################	######################################################################
######################################################################	######################################################################

	sub display_tools {
	my ($title, $jumpurl) = @_;
	my $result;
	# Metadata
	$result.=
	&Apache::loncommon::modal_link(
	$jumpurl.'.meta?inhibitmenu=yes',
	'<img class="LC_icon" src="/res/adm/pages/catalog.png" alt="Info" />',
	500,500,'_blank',undef,&mt('Metadata'));
	# Stored Links
	$result.=
	' <a href="javascript:;"'.
	' onclick="set_wishlistlink('."'$title','$jumpurl'".')" '.
	'title="'.&mt('Save a link for this resource in your personal Stored Links repository').'">'.
	'<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
	'alt="Stored Links" style="width:22px;"/></a>';
	return $result;
	}

	######################################################################
	######################################################################

=pod	=pod

=item Metadata Viewing Functions	=item Metadata Viewing Functions
Line 3181 sub detailed_citation_view {	Line 3345 sub detailed_citation_view {
my $result;	my $result;
my $jumpurl=$values{'url'};	my $jumpurl=$values{'url'};
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;
$result .= '<b>'.$prefix.	$result .=
	'<b>'.$prefix.
'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '.	'<img src="'.&Apache::loncommon::icon($values{'url'}).'" alt="" />'.' '.
'<a href="'.$jumpurl.'?inhibitmenu=yes" '.	'<a href="'.$jumpurl.'?inhibitmenu=yes" '.
'target="preview">'.$values{'title'}."</a></b>\n".	'target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}."</a></b>\n".
'<a href="javascript:;" onclick="set_wishlistlink('."'$values{'title'}','$jumpurl'".')" '.	&display_tools($values{'title'}, $jumpurl).
'title="'.&mt('Set link to wishlist').'">'.	"<p>\n".
'<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.	'<b>'.$values{'author'}.'</b>,'.
'alt="set wishlistlink" style="width:22px;"/></a>';
$result .= "<p>\n";
$result .= '<b>'.$values{'author'}.'</b>,'.
' <i>'.$values{'owner'}.'</i><br />';	' <i>'.$values{'owner'}.'</i><br />';
foreach my $field	foreach my $field
(	(
Line 3318 sub summary_view {	Line 3480 sub summary_view {
my $jumpurl=$values{'url'};	my $jumpurl=$values{'url'};
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;
my $link = '<br />'.&display_url($jumpurl,1).'<br />';	my $link = '<br />'.&display_url($jumpurl,1).'<br />';
	$result .=
my $titleWL = &mt('Set link to wishlist');	'<a href="'.$jumpurl.'?inhibitmenu=yes"'.
$result.=<<END;	' target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.$values{'title'}.'</a>'.
<a href="$jumpurl?inhibitmenu=yes"	&display_tools($values{'title'}, $jumpurl).<<END;
target="preview">$values{'title'}</a>
<a href="javascript:;" onclick="set_wishlistlink('$values{'title'}','$jumpurl')"
title="$titleWL">
<img class="LC_icon" src="/res/adm/pages/wishlist.png"
alt="set wishlistlink" style="width:22px;"/>
</a>
<br />	<br />
$link<br />	$link<br />
$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />	$values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
Line 3372 sub compact_view {	Line 3528 sub compact_view {
}	}
$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');	$jumpurl = &HTML::Entities::encode($jumpurl,'<>&"');
$result.=' <span class="LC_nobreak">'.	$result.=' <span class="LC_nobreak">'.
'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview">'.	'<a href="'.$jumpurl.'?inhibitmenu=yes" target="preview" onclick="openMyModal(this.href, 500, 500, \'yes\');return false;">'.
&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.	&HTML::Entities::encode($values{'title'},'<>&"').'</a></span> '.
'<a href="javascript:;" onclick="set_wishlistlink('."'$values{'title'}','$jumpurl'".')" '.	&display_tools($values{'title'}, $jumpurl).
'title="'.&mt('Set link to wishlist').'">'.
'<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
'alt="set wishlistlink" style="width:22px;"/>'.
'</a>'.
$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';	$link.' <b>'.$values{'author'}.'</b> ('.$values{'domain'}.')';
return $result;	return $result;
}	}
Line 3392 sub display_url {	Line 3544 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',
'',	'',
(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),	(($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),
$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;
}	}
Line 3420 sub fielded_format_view {	Line 3582 sub fielded_format_view {
my $jumpurl=$values{'url'};	my $jumpurl=$values{'url'};
$jumpurl=~s\|^/ext/\|http://\|;	$jumpurl=~s\|^/ext/\|http://\|;

my $titleWL = ('Set link to wishlist');
my $result=<<END;	my $result=<<END;
$prefix <img src="$icon" alt="" />	$prefix <img src="$icon" alt="" />
<dl>	<dl>
<dt>URL:</dt>	<dt>URL:</dt>
<dd><a href="$jumpurl?inhibitmenu=yes"	<dd><a href="$jumpurl?inhibitmenu=yes"
target='preview'>$values{'url'}</a>	target='preview'>$values{'url'}</a>
<a href="javascript:;" onclick="set_wishlistlink('$values{'title'}','$jumpurl')"
title="$titleWL">
<img class="LC_icon" src="/res/adm/pages/wishlist.png"
alt="set wishlistlink" style="width:22px;"/>
</a>
</dd>
END	END
	$result .=
	&display_tools($values{'title'}, $jumpurl).'
	</dd>';
foreach my $field ('title','author','domain','subject','keywords','notes',	foreach my $field ('title','author','domain','subject','keywords','notes',
'mimetag','language','creationdate','lastrevisiondate',	'mimetag','language','creationdate','lastrevisiondate',
'owner','copyrighttag','hostname','abstract') {	'owner','copyrighttag','hostname','abstract') {
Line 3707 Cleans the global %groupsearch_db by rem	Line 3865 Cleans the global %groupsearch_db by rem
######################################################################	######################################################################
sub start_fresh_session {	sub start_fresh_session {
delete $groupsearch_db{'mode_catalog'};	delete $groupsearch_db{'mode_catalog'};
foreach (keys %groupsearch_db) {	foreach (keys(%groupsearch_db)) {
if ($_ =~ /^pre_/) {	if ($_ =~ /^pre_/) {
delete $groupsearch_db{$_};	delete $groupsearch_db{$_};
}	}
Line 3725 sub cleanup {	Line 3883 sub cleanup {
&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');	&Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
}	}
}	}
&untiehash();
&Apache::lonmysql::disconnect_from_db();	&Apache::lonmysql::disconnect_from_db();
return OK;	return OK;
}	}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.331
changed lines
	Added in v.1.331.4.12