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.146 and 1.158

version 1.146, 2002/07/29 21:53:57	version 1.158, 2002/09/16 20:57:28
Line 25	Line 25
#	#
# http://www.lon-capa.org/	# http://www.lon-capa.org/
#	#
# YEAR=2001
# 3/8, 3/12, 3/13, 3/14, 3/15, 3/19 Scott Harrison
# 3/20, 3/21, 3/22, 3/26, 3/27, 4/2, 8/15, 8/24, 8/25 Scott Harrison
# 10/12,10/14,10/15,10/16,11/28,11/29,12/10,12/12,12/16 Scott Harrison
# YEAR=2002
# 1/17 Scott Harrison
# 6/17 Matthew Hall
#
###############################################################################	###############################################################################
###############################################################################	###############################################################################

Line 123 that produces it. Adding a new view typ	Line 115 that produces it. Adding a new view typ
adding a line to the definition of this hash and making sure the function	adding a line to the definition of this hash and making sure the function
takes the proper parameters.	takes the proper parameters.

	=item $bodytag

	LON-CAPA standard body tag, gotten from &Apache::lonnet::bodytag.
	No title, no table, just a <body> tag.

=back	=back

=cut	=cut
Line 140 my $diropendb = ""; # db file	Line 137 my $diropendb = ""; # db file
my %Views = ("Detailed Citation View" => \&detailed_citation_view,	my %Views = ("Detailed Citation View" => \&detailed_citation_view,
"Summary View" => \&summary_view,	"Summary View" => \&summary_view,
"Fielded Format" => \&fielded_format_view,	"Fielded Format" => \&fielded_format_view,
"XML/SGML" => \&xml_sgml_view );	"XML/SGML" => \&xml_sgml_view,
	"Compact View" => \&compact_view);
my %persistent_db;	my %persistent_db;
my $hidden_fields;	my $hidden_fields;
	my $bodytag;

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

Line 171 string that holds portions of the screen	Line 171 string that holds portions of the screen
sub handler {	sub handler {
my $r = shift;	my $r = shift;
#	#

	my $loaderror=&Apache::lonnet::overloaderror($r);
	if ($loaderror) { return $loaderror; }

my $closebutton; # button that closes the search window	my $closebutton; # button that closes the search window
# This button is different for the RAT compared to	# This button is different for the RAT compared to
# normal invocation.	# normal invocation.
Line 178 sub handler {	Line 182 sub handler {
$r->content_type('text/html');	$r->content_type('text/html');
$r->send_http_header;	$r->send_http_header;
return OK if $r->header_only;	return OK if $r->header_only;
	##
	## Prevent caching of the search interface window. Hopefully this means
	## we will get the launch=1 passed in a little more.
	&Apache::loncommon::no_cache($r);
##	##
## Pick up form fields passed in the links.	## Pick up form fields passed in the links.
##	##
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
['catalogmode','launch','acts','mode','form','element','pause',	['catalogmode','launch','acts','mode','form','element','pause',
'phase','persistent_db_id','table','start','show']);	'phase','persistent_db_id','table','start','show',
	'cleargroupsort']);
##	##
## The following is a trick - we wait a few seconds if asked to so	## The following is a trick - we wait a few seconds if asked to so
## the daemon running the search can get ahead of the daemon	## the daemon running the search can get ahead of the daemon
Line 191 sub handler {	Line 200 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(5);	sleep(3);
delete($ENV{'form.pause'});	delete($ENV{'form.pause'});
}	}
##	##
Line 204 sub handler {	Line 213 sub handler {
# set the name of the persistent database	# set the name of the persistent database
# $ENV{'form.persistent_db_id'} can only have digits in it.	# $ENV{'form.persistent_db_id'} can only have digits in it.
if (! exists($ENV{'form.persistent_db_id'}) \|\|	if (! exists($ENV{'form.persistent_db_id'}) \|\|
$ENV{'form.persistent_db_id'} =~ /\D/ ) {	($ENV{'form.persistent_db_id'} =~ /\D/) \|\|
	($ENV{'form.launch'} eq '1')) {
$ENV{'form.persistent_db_id'} = time;	$ENV{'form.persistent_db_id'} = time;
}	}
	$bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
my $persistent_db_file = "/home/httpd/perl/tmp/".	my $persistent_db_file = "/home/httpd/perl/tmp/".
&Apache::lonnet::escape($domain).	&Apache::lonnet::escape($domain).
'_'.&Apache::lonnet::escape($ENV{'user.name'}).	'_'.&Apache::lonnet::escape($ENV{'user.name'}).
'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db';	'_'.$ENV{'form.persistent_db_id'}.'_persistent_search.db';
##	##
&get_persistent_form_data($r,$persistent_db_file);	if (! &get_persistent_form_data($persistent_db_file)) {
	if ($ENV{'form.phase'} =~ /(run_search\|results)/) {
	&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".
	"from $persistent_db_file");
	$r->print(<<END);
	<html>
	<head><title>LON-CAPA Search Error</title></head>
	$bodytag
	We were unable to retrieve data describing your search. This is a serious
	error and has been logged. Please alert your LON-CAPA administrator.
	</body>
	</html>
	END
	return OK;
	}
	}
##	##
## Clear out old values from groupsearch database	## Clear out old values from groupsearch database
##	##
untie %groupsearch_db if (tied(%groupsearch_db));	untie %groupsearch_db if (tied(%groupsearch_db));
if ($ENV{'form.launch'} eq '1') {	if (($ENV{'form.cleargroupsort'} eq '1') \|\|
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {	(($ENV{'form.launch'} eq '1') &&
	($ENV{'form.catalogmode'} eq 'groupsearch'))) {
	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
&start_fresh_session();	&start_fresh_session();
untie %groupsearch_db;	untie %groupsearch_db;
	delete($ENV{'form.cleargroupsort'});
} else {	} else {
$r->print('<html><head></head><body>Unable to tie hash to db '.	# This is a stupid error to give to the user.
'file</body></html>');	# It really tells them nothing.
	$r->print('<html><head></head>'.$bodytag.
	'Unable to tie hash to db file</body></html>');
return OK;	return OK;
}	}
}	}
##	##
## Configure dynamic components of interface	## Configure hidden fields
##	##
$hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.	$hidden_fields = '<input type="hidden" name="persistent_db_id" value="'.
$ENV{'form.persistent_db_id'}.'" />';	$ENV{'form.persistent_db_id'}.'" />'."\n";
	if (exists($ENV{'form.catalogmode'})) {
	$hidden_fields .= '<input type="hidden" name="catalogmode" value="'.
	$ENV{'form.catalogmode'}.'" />'."\n";
	}
	if (exists($ENV{'form.form'})) {
	$hidden_fields .= '<input type="hidden" name="form" value="'.
	$ENV{'form.form'}.'" />'."\n";
	}
	if (exists($ENV{'form.element'})) {
	$hidden_fields .= '<input type="hidden" name="element" value="'.
	$ENV{'form.element'}.'" />'."\n";
	}
	if (exists($ENV{'form.mode'})) {
	$hidden_fields .= '<input type="hidden" name="mode" value="'.
	$ENV{'form.mode'}.'" />'."\n";
	}
	##
	## Configure dynamic components of interface
##	##
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
$closebutton="<input type='button' name='close' value='CLOSE' ".	$closebutton="<input type='button' name='close' value='CLOSE' ";
"onClick='self.close()'>"."\n";	if ($ENV{'form.phase'} =~ /(results\|run_search)/) {
	$closebutton .="onClick='parent.close()'";
	} else {
	$closebutton .="onClick='self.close()'";
	}
	$closebutton .=">\n";
} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {	} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
$closebutton=<<END;	$closebutton="<input type='button' name='close' value='CLOSE' ";
<input type='button' name='close' value='CLOSE' onClick='self.close()'>	if ($ENV{'form.phase'} =~ /(results\|run_search)/) {
END	$closebutton .="onClick='parent.close()'";
	} else {
	$closebutton .="onClick='self.close()'";
	}
	$closebutton .= ">";
$importbutton=<<END;	$importbutton=<<END;
<input type='button' name='import' value='IMPORT'	<input type='button' name='import' value='IMPORT'
onClick='javascript:select_group()'>	onClick='javascript:select_group()'>
Line 252 END	Line 310 END
## Sanity checks on form elements	## Sanity checks on form elements
##	##
if (!defined($ENV{'form.viewselect'})) {	if (!defined($ENV{'form.viewselect'})) {
$ENV{'form.viewselect'} ="Detailed Citation View";	if (($ENV{'form.catalogmode'} eq 'groupsearch') \|\|
	($ENV{'form.catalogmode'} eq 'interactive')) {
	$ENV{'form.viewselect'} ="Compact View";
	} else {
	$ENV{'form.viewselect'} ="Detailed Citation View";
	}
}	}
$ENV{'form.phase'} = 'displaybasic' if (! exists($ENV{'form.phase'}));	$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
	$ENV{'form.show'} = 20 if (! exists($ENV{'form.show'}));
##	##
## Switch on the phase	## Switch on the phase
##	##
Line 264 END	Line 328 END
&print_advanced_search_form($r,$closebutton);	&print_advanced_search_form($r,$closebutton);
} elsif ($ENV{'form.phase'} eq 'results') {	} elsif ($ENV{'form.phase'} eq 'results') {
&display_results($r,$importbutton,$closebutton);	&display_results($r,$importbutton,$closebutton);
} elsif($ENV{'form.phase'} eq 'run_search') {	} elsif ($ENV{'form.phase'} =~ /^(sort\|run_search)$/) {
my ($query,$customquery,$customshow,$libraries,$pretty_string) =	my ($query,$customquery,$customshow,$libraries,$pretty_string) =
&get_persistent_data($persistent_db_file,	&get_persistent_data($persistent_db_file,
['query','customquery','customshow',	['query','customquery','customshow',
'libraries','pretty_string']);	'libraries','pretty_string']);
&write_status($r,"query = $query");	if ($ENV{'form.phase'} eq 'sort') {
&write_status($r,"customquery = $customquery");	&print_sort_form($r,$pretty_string);
&write_status($r,"customshow = $customshow");	} elsif ($ENV{'form.phase'} eq 'run_search') {
&write_status($r,"libraries = $libraries");	&run_search($r,$query,$customquery,$customshow,
&write_status($r,"pretty_string = $pretty_string");	$libraries,$pretty_string);
&run_search($r,$query,$customquery,$customshow,	}
$libraries,$pretty_string);
} 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')) {
	$ENV{'form.searchmode'} = 'basic';
	if ($ENV{'form.phase'} eq 'adv_search') {
	$ENV{'form.searchmode'} = 'advanced';
	}
# Set up table	# Set up table
if (! defined(&create_results_table())) {	if (! defined(&create_results_table())) {
# Unable to make table to store results in.	$r->print(<<END);
# Definately abort search.	<html><head><title>Search Error</title></head>
	$bodytag
	Unable to create table in which to store search results.
	The search has been aborted.
	</body>
	</html>
	END
	return OK;
}	}
	delete($ENV{'form.launch'});
if (! &make_form_data_persistent($r,$persistent_db_file)) {	if (! &make_form_data_persistent($r,$persistent_db_file)) {
# Unable to store persistent data.	$r->print(<<END);
# Probably should bail out.	<html><head><title>Search Error</title></head>
	$bodytag
	Unable to properly store search information. The search has been aborted.
	</body>
	</html>
	END
	return OK;
}	}
#	#
# We are running a search	# We are running a search
Line 299 END	Line 380 END
= &parse_advanced_search($r,$closebutton);	= &parse_advanced_search($r,$closebutton);
return OK if (! defined($query));	return OK if (! defined($query));
}	}
&write_status($r,"query = $query");	&make_persistent({ query => $query,
&write_status($r,"customquery = $customquery");
&write_status($r,"customshow = $customshow");
&write_status($r,"libraries = $libraries");
&write_status($r,"pretty_string = $pretty_string");
&make_persistent($r,
{ query => $query,
customquery => $customquery,	customquery => $customquery,
customshow => $customshow,	customshow => $customshow,
libraries => $libraries,	libraries => $libraries,
Line 335 Returns a scalar which holds html for th	Line 410 Returns a scalar which holds html for th

sub print_basic_search_form{	sub print_basic_search_form{
my ($r,$closebutton) = @_;	my ($r,$closebutton) = @_;
	my $bodytag=&Apache::loncommon::bodytag('Catalog Search');
my $scrout=<<"ENDDOCUMENT";	my $scrout=<<"ENDDOCUMENT";
<html>	<html>
<head>	<head>
Line 347 sub print_basic_search_form{	Line 423 sub print_basic_search_form{
}	}
</script>	</script>
</head>	</head>
<body bgcolor="#FFFFFF">	$bodytag
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
<input type="hidden" name="phase" value="basic_search" />	<input type="hidden" name="phase" value="basic_search" />
$hidden_fields	$hidden_fields
<h3>Basic Search</h3>
<p>	<p>
Enter terms or phrases separated by AND, OR, or NOT	Enter terms or phrases separated by AND, OR, or NOT
then press SEARCH below.	then press SEARCH below.
Line 364 then press SEARCH below.	Line 437 then press SEARCH below.
ENDDOCUMENT	ENDDOCUMENT
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).	$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
' ';	' ';
# $scrout.=&simplecheckbox('allversions',$ENV{'form.allversions'});
# $scrout.='<font color="#800000">Search historic archives</font>';
my $checkbox = &simplecheckbox('related',$ENV{'form.related'});	my $checkbox = &simplecheckbox('related',$ENV{'form.related'});
$scrout.=<<END;	$scrout.=<<END;
</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr>	</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr>
Line 380 END	Line 451 END
$ENV{'form.viewselect'},	$ENV{'form.viewselect'},
undef,undef,undef,	undef,undef,undef,
sort(keys(%Views)));	sort(keys(%Views)));
	$scrout.=&selectbox(undef,'show',
	$ENV{'form.show'},
	undef,undef,undef,
	(10,20,50,100));
$scrout.=<<ENDDOCUMENT;	$scrout.=<<ENDDOCUMENT;
<input type="button" value="HELP" onClick="openhelp()" />	per page.
</p>	</p>
</form>	</form>
</body>	</body>
Line 417 END	Line 492 END
if (!defined($ENV{'form.viewselect'})) {	if (!defined($ENV{'form.viewselect'})) {
$ENV{'form.viewselect'} ="Detailed Citation View";	$ENV{'form.viewselect'} ="Detailed Citation View";
}	}
	my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');
my $scrout=<<"ENDHEADER";	my $scrout=<<"ENDHEADER";
<html>	<html>
<head>	<head>
Line 429 END	Line 505 END
}	}
</script>	</script>
</head>	</head>
<body bgcolor="#FFFFFF">	$bodytag
<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Advanced Catalog Search</h1>
<hr />
Enter terms or phrases separated by search operators	Enter terms or phrases separated by search operators
such as AND, OR, or NOT.<br />	such as AND, OR, or NOT.<br />
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
Line 447 ENDHEADER	Line 520 ENDHEADER
$ENV{'form.viewselect'},	$ENV{'form.viewselect'},
undef,undef,undef,	undef,undef,undef,
sort(keys(%Views)));	sort(keys(%Views)));
	$scrout.=' ';
	$scrout.=&selectbox(undef,'show',
	$ENV{'form.show'},
	undef,undef,undef,
	(10,20,50,100));
	$scrout.=' '.
	'<font color="#800000" face="helvetica">Per Page</font>';
$scrout.="</td><td>Related<br />Words</td></tr>\n";	$scrout.="</td><td>Related<br />Words</td></tr>\n";
$scrout.=&searchphrasefield_with_related('title', 'title' ,	$scrout.=&searchphrasefield_with_related('title', 'title' ,
$ENV{'form.title'});	$ENV{'form.title'});
Line 555 LASTREVISIONDATEEND	Line 635 LASTREVISIONDATEEND
(&Apache::loncommon::copyrightids),	(&Apache::loncommon::copyrightids),
);	);
# ------------------------------------------- Compute customized metadata field	# ------------------------------------------- Compute customized metadata field
$scrout.=<<CUSTOMMETADATA;	# $scrout.=<<CUSTOMMETADATA;
<p>	#<p>
<font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>	#<font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b>
</font>	#</font>
For resource-specific metadata, enter in an expression in the form of	#For resource-specific metadata, enter in an expression in the form of
<i>key</i>=<i>value</i> separated by operators such as AND, OR or NOT.<br />	#<i>key</i>=<i>value</i> separated by operators such as AND, OR or NOT.<br />
<b>Example:</b> grandmother=75 OR grandfather=85	#<b>Example:</b> grandmother=75 OR grandfather=85
<br />	#<br />
CUSTOMMETADATA	#CUSTOMMETADATA
$scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});	# $scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'});
$scrout.=<<CUSTOMSHOW;	# $scrout.=<<CUSTOMSHOW;
<p>	#<p>
<font color="#800000" face="helvetica"><b>SHOW SPECIAL METADATA FIELDS:</b>	#<font color="#800000" face="helvetica"><b>SHOW SPECIAL METADATA FIELDS:</b>
</font>	#</font>
Enter in a space-separated list of special metadata fields to show	#Enter in a space-separated list of special metadata fields to show
in a fielded listing for each record result.	#in a fielded listing for each record result.
<br />	#<br />
CUSTOMSHOW	#CUSTOMSHOW
$scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});	# $scrout.=&simpletextfield('customshow',$ENV{'form.customshow'});
$scrout.=<<ENDDOCUMENT;	$scrout.=<<ENDDOCUMENT;
$advanced_buttons	$advanced_buttons
</form>	</form>
Line 606 to them.	Line 686 to them.
######################################################################	######################################################################
######################################################################	######################################################################
sub get_persistent_form_data {	sub get_persistent_form_data {
my $r = shift;
my $filename = shift;	my $filename = shift;
return undef if (! -e $filename);	return 0 if (! -e $filename);
return undef if (! tie(%persistent_db,'GDBM_File',$filename,	return undef if (! tie(%persistent_db,'GDBM_File',$filename,
&GDBM_READER,0640));	&GDBM_READER(),0640));
#	#
# These make sure we do not get array references printed out as 'values'.	# These make sure we do not get array references printed out as 'values'.
my %arrays_allowed = ('form.category'=>1,'form.domains'=>1);	my %arrays_allowed = ('form.category'=>1,'form.domains'=>1);
Line 618 sub get_persistent_form_data {	Line 697 sub get_persistent_form_data {
# Loop through the keys, looking for 'form.'	# Loop through the keys, looking for 'form.'
foreach my $name (keys(%persistent_db)) {	foreach my $name (keys(%persistent_db)) {
next if ($name !~ /^form./);	next if ($name !~ /^form./);
	next if (exists($ENV{$name}));
my @values = map {	my @values = map {
&Apache::lonnet::unescape($_);	&Apache::lonnet::unescape($_);
} split(',',$persistent_db{$name});	} split(',',$persistent_db{$name});
next if (@values <1);	next if (@values <1);
if (exists($ENV{$name})) {	if ($arrays_allowed{$name}) {
if (ref($ENV{$name}) eq 'ARRAY') {	$ENV{$name} = [@values];
# If it is an array, tack @values on the end of it.
$ENV{$name} = [@$ENV{$name},@values];
} elsif (! ref($ENV{$name}) && $arrays_allowed{$name}) {
# if arrays are allowed, turn it into one and add @values
$ENV{$name} = [$ENV{$name},@values];
} # otherwise, assume the value in $ENV{$name} is better than ours.
} else {	} else {
if ($arrays_allowed{$name}) {	$ENV{$name} = $values[0] if ($values[0]);
$ENV{$name} = [@values];
} else {
$ENV{$name} = $values[0] if ($values[0]);
}
}	}
&write_status($r,"Reconstructed $name = $ENV{$name}");
}	}
untie (%persistent_db);	untie (%persistent_db);
return 1;	return 1;
Line 668 sub get_persistent_data {	Line 737 sub get_persistent_data {
my @Values; # Return array	my @Values; # Return array
return undef if (! -e $filename);	return undef if (! -e $filename);
return undef if (! tie(%persistent_db,'GDBM_File',$filename,	return undef if (! tie(%persistent_db,'GDBM_File',$filename,
&GDBM_READER,0640));	&GDBM_READER(),0640));
foreach my $name (@Vars) {	foreach my $name (@Vars) {
if (! exists($persistent_db{$name})) {	if (! exists($persistent_db{$name})) {
push @Values, undef;	push @Values, undef;
Line 677 sub get_persistent_data {	Line 746 sub get_persistent_data {
my @values = map {	my @values = map {
&Apache::lonnet::unescape($_);	&Apache::lonnet::unescape($_);
} split(',',$persistent_db{$name});	} split(',',$persistent_db{$name});
if (@values == 1) {	if (@values <= 1) {
push @Values,$values[0];	push @Values,$values[0];
} else {	} else {
push @Values,\@values;	push @Values,\@values;
Line 705 elements escaped and concatenated in a c	Line 774 elements escaped and concatenated in a c
######################################################################	######################################################################
######################################################################	######################################################################
sub make_persistent {	sub make_persistent {
my $r = shift;
my %save = %{shift()};	my %save = %{shift()};
my $filename = shift;	my $filename = shift;
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)) {
next if (! exists($save{$name}));
next if (! defined($save{$name}) \|\| $save{$name} eq '');
my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));	my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));
# We handle array references, but not recursively.	# We handle array references, but not recursively.
my $store = join(',', map { &Apache::lonnet::escape($_); } @values );	my $store = join(',', map { &Apache::lonnet::escape($_); } @values );
$persistent_db{$name} = $store;	$persistent_db{$name} = $store;
&write_status($r,"Stored $name = $store");
}	}
untie(%persistent_db);	untie(%persistent_db);
return 1;	return 1;
Line 745 sub make_form_data_persistent {	Line 810 sub make_form_data_persistent {
my $filename = shift;	my $filename = shift;
my %save;	my %save;
foreach (keys(%ENV)) {	foreach (keys(%ENV)) {
next if (! /^form/ \|\| /submit/);	next if (!/^form/ \|\| /submit/);
$save{$_} = $ENV{$_};	$save{$_} = $ENV{$_};
}	}
return &make_persistent($r,\%save,$filename);	return &make_persistent(\%save,$filename);
}	}

######################################################################	######################################################################
Line 1080 sub parse_advanced_search {	Line 1145 sub parse_advanced_search {
$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;	$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
# Preprocess the category form element.	# Preprocess the category form element.
	$ENV{'form.category'} = 'any' if (ref($ENV{'form.category'}));
if ($ENV{'form.category'} ne 'any') {	if ($ENV{'form.category'} ne 'any') {
my @extensions = &Apache::loncommon::filecategorytypes	my @extensions = &Apache::loncommon::filecategorytypes
($ENV{'form.category'});	($ENV{'form.category'});
Line 1094 sub parse_advanced_search {	Line 1160 sub parse_advanced_search {
}	}
}	}
unless ($fillflag) {	unless ($fillflag) {
&output_blank_field_error($r,$closebutton);	&output_blank_field_error($r,$closebutton,'phase=disp_adv');
return ;	return ;
}	}
# Turn the form input into a SQL-based query	# Turn the form input into a SQL-based query
Line 1166 sub parse_advanced_search {	Line 1232 sub parse_advanced_search {
}	}
# Process form information for custom metadata querying	# Process form information for custom metadata querying
my $customquery=undef;	my $customquery=undef;
if ($ENV{'form.custommetadata'}) {	# if ($ENV{'form.custommetadata'}) {
$pretty_search_string .=$font."Custom Metadata Search</font>: <b>".	# $pretty_search_string .=$font."Custom Metadata Search</font>: <b>".
$ENV{'form.custommetadata'}."</b><br />\n";	# $ENV{'form.custommetadata'}."</b><br />\n";
$customquery=&build_custommetadata_query('custommetadata',	# $customquery=&build_custommetadata_query('custommetadata',
$ENV{'form.custommetadata'});	# $ENV{'form.custommetadata'});
}	# }
my $customshow=undef;	my $customshow=undef;
if ($ENV{'form.customshow'}) {	# if ($ENV{'form.customshow'}) {
$pretty_search_string .=$font."Custom Metadata Display</font>: <b>".	# $pretty_search_string .=$font."Custom Metadata Display</font>: <b>".
$ENV{'form.customshow'}."</b><br />\n";	# $ENV{'form.customshow'}."</b><br />\n";
$customshow=$ENV{'form.customshow'};	# $customshow=$ENV{'form.customshow'};
$customshow=~s/[^\w\s]//g;	# $customshow=~s/[^\w\s]//g;
my @fields=split(/\s+/,$customshow);	# my @fields=split(/\s+/,$customshow);
$customshow=join(" ",@fields);	# $customshow=join(" ",@fields);
}	# }
## ---------------------------------------------------------------	## ---------------------------------------------------------------
## Deal with restrictions to given domains	## Deal with restrictions to given domains
##	##
Line 1195 sub parse_advanced_search {	Line 1261 sub parse_advanced_search {
$domain_hash{$_}++;	$domain_hash{$_}++;
}	}
if ($domain_hash{'any'}) {	if ($domain_hash{'any'}) {
$pretty_domains_string = "Searching all domains.";	$pretty_domains_string = "In all LON-CAPA domains.";
} else {	} else {
if (@allowed_domains > 1) {	if (@allowed_domains > 1) {
$pretty_domains_string = "Searching domains:";	$pretty_domains_string = "In LON-CAPA domains:";
} else {	} else {
$pretty_domains_string = "Searching domain ";	$pretty_domains_string = "In LON-CAPA domain ";
}	}
foreach (sort @allowed_domains) {	foreach (sort @allowed_domains) {
$pretty_domains_string .= "<b>$_</b> ";	$pretty_domains_string .= "<b>".$_."</b> ";
}	}
foreach (keys(%Apache::lonnet::libserv)) {	foreach (keys(%Apache::lonnet::libserv)) {
if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {	if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
Line 1251 sub parse_basic_search {	Line 1317 sub parse_basic_search {

# Check to see if enough is filled in	# Check to see if enough is filled in
unless (&filled($ENV{'form.basicexp'})) {	unless (&filled($ENV{'form.basicexp'})) {
&output_blank_field_error($r,$closebutton);	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
return OK;	return OK;
}	}
my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>';	my $pretty_search_string = '<b>'.$ENV{'form.basicexp'}.'</b>';
Line 1487 sub build_date_queries {	Line 1553 sub build_date_queries {

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

sub copyright_check {	sub copyright_check {
my $Metadata = shift;	my $Metadata = shift;
# Check copyright tags and skip results the user cannot use	# Check copyright tags and skip results the user cannot use
Line 1507 sub copyright_check {	Line 1572 sub copyright_check {
return 1;	return 1;
}	}


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

	=pod

	=item &ensure_db_and_table

	Ensure we can get lonmysql to connect to the database and the table we
	need exists.

	Inputs: $r, table id

	Returns: undef on error, 1 if the table exists.

	=cut

	######################################################################
	######################################################################
	sub ensure_db_and_table {
	my ($r,$table) = @_;
	##
	## Sanity check the table id.
	##
	if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {
	$r->print("Unable to retrieve search results. ".
	"Unable to determine the table results were stored in. ".
	"</body></html>");
	return undef;
	}
	##
	## Make sure we can connect and the table exists.
	##
	my $connection_result = &Apache::lonmysql::connect_to_db();
	if (!defined($connection_result)) {
	$r->print("Unable to connect to the MySQL database where your results".
	" are stored. </body></html>");
	&Apache::lonnet::logthis("lonsearchcat: unable to get lonmysql to".
	" connect to database.");
	&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
	return undef;
	}
	my $table_check = &Apache::lonmysql::check_table($table);
	if (! defined($table_check)) {
	$r->print("A MySQL error has occurred.</form></body></html>");
	&Apache::lonnet::logthis("lonmysql was unable to determine the status".
	" of table ".$table);
	return undef;
	} elsif (! $table_check) {
	$r->print("The table of results could not be found.");
	&Apache::lonnet::logthis("The user requested a table, ".$table.
	", that could not be found.");
	return undef;
	}
	return 1;
	}

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

	=pod

	=item &print_sort_form

	=cut

	######################################################################
	######################################################################
	sub print_sort_form {
	my ($r,$pretty_query_string) = @_;
	##
	my %SortableFields =
	(id => 'Default',
	title => 'Title',
	author => 'Author',
	subject => 'Subject',
	url => 'URL',
	version => 'Version Number',
	mime => 'Mime type',
	lang => 'Language',
	owner => 'Owner/Publisher',
	copyright => 'Copyright',
	hostname => 'Host',
	creationdate => 'Creation Date',
	lastrevisiondate => 'Revision Date',
	);
	##
	my $table = $ENV{'form.table'};
	return if (! &ensure_db_and_table($r,$table));
	##
	## Get the number of results
	##
	my $total_results = &Apache::lonmysql::number_of_rows($table);
	if (! defined($total_results)) {
	$r->print("A MySQL error has occurred.</form></body></html>");
	&Apache::lonnet::logthis("lonmysql was unable to determine the number".
	" of rows in table ".$table);
	&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
	return;
	}
	my $result;
	$result.=<<END;
	<html>
	<head>
	<script>
	function change_sort() {
	var newloc = "/adm/searchcat?phase=results";
	newloc += "&persistent_db_id=$ENV{'form.persistent_db_id'}";
	newloc += "&sortby=";
	newloc += document.forms.statusform.elements.sortby.value;
	parent.resultsframe.location= newloc;
	}
	</script>
	<title>Results</title>
	</head>
	$bodytag
	<form name="statusform" action="" method="post">
	<input type="hidden" name="Queue" value="" />
	END

	#<h2>Sort Results</h2>
	#Sort by: <select size="1" name="sortby" onchange="javascript:change_sort();">
	# $ENV{'form.sortby'} = 'id' if (! defined($ENV{'form.sortby'}));
	# foreach (keys(%SortableFields)) {
	# $result.="<option name=\"$_\"";
	# if ($_ eq $ENV{'form.sortby'}) {
	# $result.=" selected ";
	# }
	# $result.=" >$SortableFields{$_}</option>\n";
	# }
	# $result.="</select>\n";
	my $revise = &revise_button();
	$result.=<<END;
	<p>
	There are $total_results matches to your query. $revise
	</p><p>
	Search:$pretty_query_string
	</p>
	</form>
	</body>
	</html>
	END
	$r->print($result);
	return;
	}

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

Line 1527 the following format:	Line 1738 the following format:
## columns of type 'enum' cannot be used for FULLTEXT.	## columns of type 'enum' cannot be used for FULLTEXT.
##	##
my @DataOrder = qw/id title author subject url keywords version notes	my @DataOrder = qw/id title author subject url keywords version notes
abstract mime lang owner copyright creationdate lastrevisiondate hostname	abstract mime lang owner copyright creationdate lastrevisiondate hostname/;
idx_title idx_author idx_subject idx_abstract idx_mime idx_language
idx_owner idx_copyright/;

my %Datatypes =	my %Datatypes =
( id =>{ type => 'INT',	( id =>{ type => 'MEDIUMINT',
restrictions => 'NOT NULL',	restrictions => 'UNSIGNED NOT NULL',
primary_key => 'yes',	primary_key => 'yes',
auto_inc => 'yes'	auto_inc => 'yes'
},	},
Line 1555 my %Datatypes =	Line 1764 my %Datatypes =
creationdate =>{ type=>'DATETIME'},	creationdate =>{ type=>'DATETIME'},
lastrevisiondate =>{ type=>'DATETIME'},	lastrevisiondate =>{ type=>'DATETIME'},
#--------------------------------------------------	#--------------------------------------------------
idx_title =>{ type=>'FULLTEXT', target=>'title'},
idx_author =>{ type=>'FULLTEXT', target=>'author'},
idx_subject =>{ type=>'FULLTEXT', target=>'subject'},
idx_abstract =>{ type=>'FULLTEXT', target=>'abstract'},
idx_mime =>{ type=>'FULLTEXT', target=>'mime'},
idx_language =>{ type=>'FULLTEXT', target=>'lang'},
idx_owner =>{ type=>'FULLTEXT', target=>'owner'},
idx_copyright =>{ type=>'FULLTEXT', target=>'copyright'},
);	);

	my @Fullindicies =
	qw/title/;
	# qw/title author subject abstract mime language owner copyright/;

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

Line 1587 sub create_results_table {	Line 1792 sub create_results_table {
my $table = &Apache::lonmysql::create_table	my $table = &Apache::lonmysql::create_table
( { columns => \%Datatypes,	( { columns => \%Datatypes,
column_order => \@DataOrder,	column_order => \@DataOrder,
	fullindex => \@Fullindicies,
} );	} );
if (defined($table)) {	if (defined($table)) {
$ENV{'form.table'} = $table;	$ENV{'form.table'} = $table;
Line 1594 sub create_results_table {	Line 1800 sub create_results_table {
}	}
return undef; # Error...	return undef; # Error...
}	}

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

=pod	=pod

=item &write_status()	=item Search Status update functions

	Each of the following functions changes the values of one of the
	input fields used to display the search status to the user. The names
	should be explanatory.

	Inputs: Apache request handler ($r), text to display.

	Returns: Nothing.

	=over 4

	=item &update_count_status()

	=item &update_status()

	=item &update_seconds()

	=back

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub write_status {	sub update_count_status {
my ($r,$string) = @_;	my ($r,$text) = @_;
$string =~ s/(\')/\$1/g;	$text =~ s/\'/\\\'/g;
$string =~ s/\n//sg;	$r->print
# $r->print("<script>alert('$string');</script>\n");	("<script>document.statusform.count.value = ' $text'</script>\n");
# $r->rflush();	$r->rflush();
return;	}

	sub update_status {
	my ($r,$text) = @_;
	$text =~ s/\'/\\\'/g;
	$r->print
	("<script>document.statusform.status.value = ' $text'</script>\n");
	$r->rflush();
	}

	sub update_seconds {
	my ($r,$text) = @_;
	$text =~ s/\'/\\\'/g;
	$r->print
	("<script>document.statusform.seconds.value = ' $text'</script>\n");
	$r->rflush();
	}

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

	=pod

	=item &revise_button

	Inputs: None

	Returns: html string for a 'revise search' button.

	=cut

	######################################################################
	######################################################################
	sub revise_button {
	my $revise_phase = 'disp_basic';
	$revise_phase = 'disp_adv' if ($ENV{'form.searchmode'} eq 'advanced');
	my $newloc = '/adm/searchcat'.
	'?persistent_db_id='.$ENV{'form.persistent_db_id'}.
	'&cleargroupsort=1'.
	'&phase='.$revise_phase;
	my $result = qq{<input type="button" value="Revise search" name="revise"} .
	qq{ onClick="parent.location='$newloc';" /> };
	return $result;
}	}

######################################################################	######################################################################
Line 1627 sub write_status {	Line 1894 sub write_status {
######################################################################	######################################################################
sub run_search {	sub run_search {
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;	my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
	my $connection = $r->connection;
#	#
# Timing variables	# Timing variables
#	#
my $starttime = time;	my $starttime = time;
my $max_time = 120; # seconds for the search to complete	my $max_time = 30; # seconds for the search to complete
#	#
# Print run_search header	# Print run_search header
#	#
$r->print("<html><head><title>Search Status</title></head><body>");	$r->print(<<END);
$r->print("Search: ".$pretty_string."<br />\n");	<html>
	<head><title>Search Status</title></head>
	$bodytag
	<form name="statusform" action="" method="post">
	<input type="hidden" name="Queue" value="" />
	END
	# Check to see if $pretty_string has more than one carriage return.
	# Assume \n s are following <br /> s and truncate the value.
	# (there is probably a better way)...
	my @Lines = split /<br \/>/,$pretty_string;
	if (@Lines > 2) {
	$pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
	}
	$r->print("Search: ".$pretty_string);
$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;
if (defined($serverlist)) {	if (defined($serverlist)) {
@Servers_to_contact = @$serverlist;	if (ref($serverlist) eq 'ARRAY') {
	@Servers_to_contact = @$serverlist;
	} else {
	@Servers_to_contact = ($serverlist);
	}
} else {	} else {
@Servers_to_contact = sort(keys(%Apache::lonnet::libserv));	@Servers_to_contact = sort(keys(%Apache::lonnet::libserv));
}	}
my %Server_status;	my %Server_status;
my $table =$ENV{'form.table'};	my $table =$ENV{'form.table'};
if (! defined($table)) {	if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {
# What do I do now? Print out an error page.	$r->print("Unable to determine table id to store search results in.".
&Apache::lonnet::logthis("lonmysql attempted to create a table ".	"The search has been aborted.</body></html>");
"and this was the result:".	return;
	}
	my $table_status = &Apache::lonmysql::check_table($table);
	if (! defined($table_status)) {
	$r->print("Unable to determine status of table.</body></html>");
	&Apache::lonnet::logthis("Bogus table id of $table for ".
	"$ENV{'user.name'} @ $ENV{'user.domain'}");
	&Apache::lonnet::logthis("lonmysql error = ".
&Apache::lonmysql::get_error());	&Apache::lonmysql::get_error());
$r->print("An internal error occured with the database.<br />".	return;
"The error has been logged, but you should probably alert".	}
" your system administrator.");	if (! $table_status) {
	$r->print("The table id,$table, we tried to use is invalid.".
	"The search has been aborted.</body></html>");
return;	return;
}	}
##	##
Line 1665 sub run_search {	Line 1959 sub run_search {
my $hitcountsum;	my $hitcountsum;
my $server;	my $server;
my $status;	my $status;
while ((time - $starttime < $max_time) &&	my $revise = &revise_button();
	$r->print(<<END);
	<table>
	<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
	<tr>
	<td><input type="text" name="status" value="" size="30" /></td>
	<td><input type="text" name="count" value="" size="10" /></td>
	<td><input type="text" name="seconds" value="" size="8" /></td>
	<td>$revise</td>
	</tr>
	</table>
	</form>
	END
	$r->rflush();
	my $time_remaining = $max_time - (time - $starttime) ;
	my $last_time = $time_remaining;
	&update_seconds($r,$time_remaining);
	while (($time_remaining > 0) &&
((@Servers_to_contact) \|\| keys(%Server_status))) {	((@Servers_to_contact) \|\| keys(%Server_status))) {
# Send out a search request if it needs to be done.	# Send out a search request if it needs to be done.
if (@Servers_to_contact) {	if (@Servers_to_contact) {
Line 1675 sub run_search {	Line 1986 sub run_search {
$customshow,[$server]);	$customshow,[$server]);
($server) = keys(%$reply);	($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};	$Server_status{$server} = $reply->{$server};
# $r->print("Contacted:$server:reply:$Server_status{$server}");	&update_status($r,'contacting '.$server);
if ($max_time - (time - $starttime) < 20) {
# If there are less than 20 seconds to go in the search,
# give the newly contacted servers 20 more seconds to
# respond....
$max_time += 20;
}
} else {	} else {
sleep(1); # wait a sec. to give time for files to be written	# wait a sec. to give time for files to be written
	# This sleep statement is here instead of outside the else
	# block because we do not want to pause if we have servers
	# left to contact.
	sleep(1);
}	}
	&update_status($r,'waiting on '.(join(' ',keys(%Server_status))));
while (my ($server,$status) = each(%Server_status)) {	while (my ($server,$status) = each(%Server_status)) {
	last if ($connection->aborted());
if ($status eq 'con_lost') {	if ($status eq 'con_lost') {
delete ($Server_status{$server});	delete ($Server_status{$server});
# $r->print("server $server is not responding.");
next;	next;
}	}
$status=~/^([\.\w]+)$/;	$status=~/^([\.\w]+)$/;
my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;	my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
if (-e $datafile && ! -e "$datafile.end") {	if (-e $datafile && ! -e "$datafile.end") {
# Let the user know we are receiving data from the server	&update_status($r,'Receiving results from '.$server);
# $r->print("$server:Receiving file");
next;	next;
}	}
	last if ($connection->aborted());
if (-e "$datafile.end") {	if (-e "$datafile.end") {
	&update_status($r,'Reading results from '.$server);
if (-z "$datafile") {	if (-z "$datafile") {
delete($Server_status{$server});	delete($Server_status{$server});
next;	next;
}	}
my $fh;	my $fh;
if (!($fh=Apache::File->new($datafile))) {	if (!($fh=Apache::File->new($datafile))) {
# Error opening file...
# Tell the user and exit...?
# Should I give up on opening it?
$r->print("Unable to open search results file for ".	$r->print("Unable to open search results file for ".
"server $server. Omitting from search");	"server $server. Omitting from search");
next;	delete($Server_status{$server});
	next;
}	}
# Read in the whole file.	# Read in the whole file.
while (my $result = <$fh>) {	while (my $result = <$fh>) {
	last if ($connection->aborted());
# handle custom fields? Someday we will!	# handle custom fields? Someday we will!
chomp($result);	chomp($result);
next unless $result;	next unless $result;
Line 1728 sub run_search {	Line 2038 sub run_search {
}	}
# $r->print(&Apache::lonmysql::get_debug());	# $r->print(&Apache::lonmysql::get_debug());
$hitcountsum ++;	$hitcountsum ++;
	$time_remaining = $max_time - (time - $starttime) ;
	if ($last_time - $time_remaining > 0) {
	&update_seconds($r,$time_remaining);
	$last_time = $time_remaining;
	}
	if ($hitcountsum % 50 == 0) {
	&update_count_status($r,$hitcountsum);
	}
} # End of foreach (@results)	} # End of foreach (@results)
$fh->close();	$fh->close();
# $server is only deleted if the results file has been	# $server is only deleted if the results file has been
# found and (successfully) opened. This may be a bad idea.	# found and (successfully) opened. This may be a bad idea.
delete($Server_status{$server});	delete($Server_status{$server});
# $r->print("Received $new_count more results from ".
# $server.".");
}	}
	last if ($connection->aborted());
	&update_count_status($r,$hitcountsum);
}	}
	last if ($connection->aborted());
# Finished looping through the servers	# Finished looping through the servers
	$time_remaining = $max_time - (time - $starttime) ;
	if ($last_time - $time_remaining > 0) {
	$last_time = $time_remaining;
	&update_seconds($r,$time_remaining);
	}
}	}
	&update_status($r,'Search Complete'.$server);
	&update_seconds($r,0);
&Apache::lonmysql::disconnect_from_db();	&Apache::lonmysql::disconnect_from_db();
# Let the user know
#
# We have run out of time or run out of servers to talk to and	# We have run out of time or run out of servers to talk to and
# results to get.	# results to get.
$r->print("<h1>Search completed.</h1>");
if ($hitcountsum) {
$r->print($hitcountsum." successful matches to your query.<br />");
} else {
$r->print("There were no successful matches to your query.<br />");
}
$r->print("</body></html>");	$r->print("</body></html>");
	if ($ENV{'form.catalogmode'} ne 'groupsearch') {
	$r->print("<script>".
	"window.location='/adm/searchcat?".
	"phase=sort&".
	"persistent_db_id=$ENV{'form.persistent_db_id'}';".
	"</script>");
	}
return;	return;
}	}

Line 1771 sub prev_next_buttons {	Line 2096 sub prev_next_buttons {
##	##
## Prev	## Prev
my $prev_min = $current_min - $show;	my $prev_min = $current_min - $show;
$prev_min = 0 if $prev_min < 0;	$prev_min = 1 if $prev_min < 1;
if ($prev_min < $current_min) {	if ($prev_min < $current_min) {
$links .= qq{	$links .= qq{
<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a>	<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a>
Line 1810 sub prev_next_buttons {	Line 2135 sub prev_next_buttons {
######################################################################	######################################################################
######################################################################	######################################################################
sub display_results {	sub display_results {
my ($r,$mode,$importbutton,$closebutton) = @_;	my ($r,$importbutton,$closebutton) = @_;
$r->print(&search_results_header());	my $connection = $r->connection;
	$r->print(&search_results_header($importbutton,$closebutton));
##	##
## Set viewing function	## Set viewing function
##	##
Line 1822 sub display_results {	Line 2148 sub display_results {
return;	return;
}	}
##	##
	## $checkbox_num is a count of the number of checkboxes output on the
	## page this is used only during catalogmode=groupsearch.
	my $checkbox_num = 0;
	##
## Get the catalog controls setup	## Get the catalog controls setup
##	##
my $action = "/adm/searchcat?phase=results";	my $action = "/adm/searchcat?phase=results";
##	##
##	## Deal with groupsearch
##	##
if ($ENV{'form.catalogmode'} eq 'groupsearch') {	if ($ENV{'form.catalogmode'} eq 'groupsearch') {
if (! tie(%groupsearch_db,'GDBM_File',$diropendb,	if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
&GDBM_WRCREAT,0640)) {	&GDBM_WRCREAT(),0640)) {
$r->print('Unable to tie hash to db file</body></html>');	$r->print('Unable to store import results.</form></body></html>');
$r->rflush();	$r->rflush();
return;	return;
}	}
Line 1840 sub display_results {	Line 2170 sub display_results {
## Prepare the table for querying	## Prepare the table for querying
##	##
my $table = $ENV{'form.table'};	my $table = $ENV{'form.table'};
my $connection_result = &Apache::lonmysql::connect_to_db();	return if (! &ensure_db_and_table($r,$table));
if (!defined($connection_result)) {
$r->print(&Apache::lonmysql::get_error());
}
my $table_check = &Apache::lonmysql::check_table($table);
if (! defined($table_check)) {
$r->print("A MySQL error has occurred.</body></html>");
&Apache::lonnet::logthis("lonmysql was unable to determine the status".
" of table ".$table);
return;
} elsif (! $table_check) {
$r->print("The table of results could not be found.");
&Apache::lonnet::logthis("The user requested a table, ".$table.
", that could not be found.");
return;
}
##	##
## Get the number of results	## Get the number of results
##	##
my $total_results = &Apache::lonmysql::number_of_rows($table);	my $total_results = &Apache::lonmysql::number_of_rows($table);
if (! defined($total_results)) {	if (! defined($total_results)) {
$r->print("A MySQL error has occurred.</body></html>");	$r->print("A MySQL error has occurred.</form></body></html>");
&Apache::lonnet::logthis("lonmysql was unable to determine the number".	&Apache::lonnet::logthis("lonmysql was unable to determine the number".
" of rows in table ".$table);	" of rows in table ".$table);
&Apache::lonnet::logthis(&Apache::lonmysql::get_error());	&Apache::lonnet::logthis(&Apache::lonmysql::get_error());
&Apache::lonnet::logthis(&Apache::lonmysql::get_debug());
return;
}
if ($total_results == 0) {
$r->print("There were no results matching your query.\n".
"</form></body></html>");
return;	return;
}	}
##	##
## Determine how many results we need to get	## Determine how many results we need to get
##	##
$ENV{'form.show'} = 20;	$ENV{'form.start'} = 1 if (! exists($ENV{'form.start'}));
$ENV{'form.start'} = 0 if (! exists($ENV{'form.start'}));	$ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'}));
$ENV{'form.show'} = 'all' if (! exists($ENV{'form.show'}));
my $min = $ENV{'form.start'};	my $min = $ENV{'form.start'};
my $max;	my $max;
if ($ENV{'form.show'} eq 'all') {	if ($ENV{'form.show'} eq 'all') {
$max = $total_results ;	$max = $total_results ;
} else {	} else {
$max = $min + $ENV{'form.show'};	$max = $min + $ENV{'form.show'} - 1;
$max = $total_results if ($max > $total_results);	$max = $total_results if ($max > $total_results);
}	}
##	##
## Output links (if necessary) for 'prev' and 'next' pages.	## Output links (if necessary) for 'prev' and 'next' pages.
##	##
$r->print("<center>Results $min to $max out of $total_results</center>\n");
$r->print	$r->print
('<br /><center>'.	('<center>'.
&prev_next_buttons($min,$ENV{'form.show'},$total_results,	&prev_next_buttons($min,$ENV{'form.show'},$total_results,
"table=".$ENV{'form.table'}.	"table=".$ENV{'form.table'}.
"&phase=results".	"&phase=results".
"&persistent_db_id=".$ENV{'form.persistent_db_id'})	"&persistent_db_id=".$ENV{'form.persistent_db_id'})
."</center><br />\n"	."</center>\n"
);	);
	if ($total_results == 0) {
	$r->print("There are currently no results.\n".
	"</form></body></html>");
	return;
	} else {
	$r->print
	("<center>Results $min to $max out of $total_results</center>\n");
	}
##	##
## Get results from MySQL table	## Get results from MySQL table
##	##
my @Results = &Apache::lonmysql::get_rows($table,	my @Results = &Apache::lonmysql::get_rows($table,
'id>'.$min.' AND id<='.$max);	'id>='.$min.' AND id<='.$max);
##	##
## Loop through the results and output them.	## Loop through the results and output them.
##	##
foreach my $row (@Results) {	foreach my $row (@Results) {
	if ($connection->aborted()) {
	untie %groupsearch_db if (tied(%groupsearch_db));
	&Apache::lonmysql::disconnect_from_db();
	return;
	}
my %Fields = %{&parse_row(@$row)};	my %Fields = %{&parse_row(@$row)};
my $output="<p>\n";	my $output="<p>\n";
$output.=&catalogmode_output($Fields{'title'},$Fields{'url'});	my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
	$Fields{'id'},$checkbox_num++);
# Render the result into html	# Render the result into html
$output.= &$viewfunction(%Fields);	$output.= &$viewfunction($prefix,%Fields);
$output.="</p>\n<hr align='left' width='200' noshade />";
# Print them out as they come in.	# Print them out as they come in.
$r->print($output);	$r->print($output);
$r->rflush();	$r->rflush();
}	}
if (@Results < 1) {	if (@Results < 1) {
$r->print("There were no results matching your query");	$r->print("There were no results matching your query");
	} else {
	$r->print
	('<center>'.
	&prev_next_buttons($min,$ENV{'form.show'},$total_results,
	"table=".$ENV{'form.table'}.
	"&phase=results".
	"&persistent_db_id=".
	$ENV{'form.persistent_db_id'})
	."</center>\n"
	);
}	}
$r->print("</body></html>");	$r->print("</form></body></html>");
$r->rflush();	$r->rflush();
untie %groupsearch_db;	untie %groupsearch_db if (tied(%groupsearch_db));
return;	return;
}	}

Line 1932 sub display_results {	Line 2262 sub display_results {

=pod	=pod

=item &catalogmode_output($title,$url)	=item &catalogmode_output($title,$url,$fnum,$checkbox_num)

Returns html needed for the various catalog modes. Gets inputs from	Returns html needed for the various catalog modes. Gets inputs from
$ENV{'form.catalogmode'}. Stores data in %groupsearch_db and $fnum	$ENV{'form.catalogmode'}. Stores data in %groupsearch_db.
(local variable).

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
{
my $fnum;

sub catalogmode_output {	sub catalogmode_output {
my $output = '';	my $output = '';
my ($title,$url) = @_;	my ($title,$url,$fnum,$checkbox_num) = @_;
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
$title=~ s/\'/\\'/g; # ' Escape single quotes.	$title=~ s/\'/\\\'/g;
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
$output.=<<END	$output.=<<END
<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"	<font size='-1'><INPUT TYPE="button" NAME="returnvalues" VALUE="SELECT"
Line 1957 onClick="javascript:select_data('$title'	Line 2283 onClick="javascript:select_data('$title'
</font>	</font>
END	END
}	}
}	} elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
if ($ENV{'form.catalogmode'} eq 'groupsearch') {
$fnum+=0;
$groupsearch_db{"pre_${fnum}_link"}=$url;	$groupsearch_db{"pre_${fnum}_link"}=$url;
$groupsearch_db{"pre_${fnum}_title"}=$title;	$groupsearch_db{"pre_${fnum}_title"}=$title;
$output.=<<END;	$output.=<<END;
<font size='-1'>	<font size='-1'>
<input type="checkbox" name="returnvalues" value="SELECT"	<input type="checkbox" name="returnvalues" value="SELECT"
onClick="javascript:queue($fnum)" />	onClick="javascript:queue($checkbox_num,$fnum)" />
</font>	</font>
END	END
$fnum++;
}	}
return $output;	return $output;
}	}

}
######################################################################	######################################################################
######################################################################	######################################################################

Line 2170 Checked for existance & 'edit' mode.	Line 2491 Checked for existance & 'edit' mode.
######################################################################	######################################################################
######################################################################	######################################################################
sub search_results_header {	sub search_results_header {
	my ($importbutton,$closebutton) = @_;
my $result = '';	my $result = '';
# output beginning of search page	# output beginning of search page
# conditional output of script functions dependent on the mode in	# conditional output of script functions dependent on the mode in
Line 2181 sub search_results_header {	Line 2503 sub search_results_header {
function select_data(title,url) {	function select_data(title,url) {
changeTitle(title);	changeTitle(title);
changeURL(url);	changeURL(url);
self.close();	parent.close();
}	}
function changeTitle(val) {	function changeTitle(val) {
if (opener.inf.document.forms.resinfo.elements.t) {	if (parent.opener.inf.document.forms.resinfo.elements.t) {
opener.inf.document.forms.resinfo.elements.t.value=val;	parent.opener.inf.document.forms.resinfo.elements.t.value=val;
}	}
}	}
function changeURL(val) {	function changeURL(val) {
if (opener.inf.document.forms.resinfo.elements.u) {	if (parent.opener.inf.document.forms.resinfo.elements.u) {
opener.inf.document.forms.resinfo.elements.u.value=val;	parent.opener.inf.document.forms.resinfo.elements.u.value=val;
}	}
}	}
</script>	</script>
Line 2202 SCRIPT	Line 2524 SCRIPT
<script type="text/javascript">	<script type="text/javascript">
function select_data(title,url) {	function select_data(title,url) {
changeURL(url);	changeURL(url);
self.close();	parent.close();
}	}
function changeTitle(val) {	function changeTitle(val) {
}	}
function changeURL(val) {	function changeURL(val) {
if (window.opener.document) {	if (parent.targetwin.document) {
window.opener.document.forms["$form"].elements["$element"].value=val;	parent.targetwin.document.forms["$form"].elements["$element"].value=val;
} else {	} else {
var url = 'forms[\"$form\"].elements[\"$element\"].value';	var url = 'forms[\"$form\"].elements[\"$element\"].value';
alert("Unable to transfer data to "+url);	alert("Unable to transfer data to "+url);
Line 2220 SCRIPT	Line 2542 SCRIPT
}	}
$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';	$result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
<script type="text/javascript">	<script type="text/javascript">
function select_data(title,url) {	function queue(checkbox_num,val) {
// alert('DEBUG: Should be storing '+title+' and '+url);	if (document.forms.results.returnvalues[checkbox_num].checked) {
}	parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
function queue(val) {	} else {
if (eval("document.forms.results.returnvalues["+val+"].checked")) {	parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
document.forms.results.acts.value+='1a'+val+'b';	}
}
else {
document.forms.results.acts.value+='0a'+val+'b';
}
}	}
function select_group() {	function select_group() {
window.location=	parent.window.location=
"/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+	"/adm/groupsort?mode=$ENV{'form.mode'}&catalogmode=groupsearch&acts="+
document.forms.results.acts.value;	parent.statusframe.document.forms.statusform.elements.Queue.value;
}	}
</script>	</script>
SCRIPT	SCRIPT
$result.=<<END;	$result.=<<END;
</head>	</head>
	$bodytag
	<form name="results" method="post" action="" >
	<input type="hidden" name="Queue" value="" />
	$importbutton
END	END
return $result;	return $result;
}	}
Line 2249 END	Line 2571 END
sub search_status_header {	sub search_status_header {
return <<ENDSTATUS;	return <<ENDSTATUS;
<html><head><title>Search Status</title></head>	<html><head><title>Search Status</title></head>
<body>	$bodytag
<h3>Search Status</h3>	<h3>Search Status</h3>
Sending search request to LON-CAPA servers.<br />	Sending search request to LON-CAPA servers.<br />
ENDSTATUS	ENDSTATUS
}	}

	sub results_link {
	my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
	"&persistent_db_id=".$ENV{'form.persistent_db_id'};
	my $results_link = $basic_link."&phase=results".
	"&pause=1"."&start=1";
	return $results_link;
	}

######################################################################	######################################################################
######################################################################	######################################################################
sub print_frames_interface {	sub print_frames_interface {
Line 2262 sub print_frames_interface {	Line 2592 sub print_frames_interface {
my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.	my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
"&persistent_db_id=".$ENV{'form.persistent_db_id'};	"&persistent_db_id=".$ENV{'form.persistent_db_id'};
my $run_search_link = $basic_link."&phase=run_search";	my $run_search_link = $basic_link."&phase=run_search";
my $results_link = $basic_link."&phase=results".	my $results_link = &results_link();
"&pause=10"."&start=0"."&show=20";
my $result = <<"ENDFRAMES";	my $result = <<"ENDFRAMES";
<html>	<html>
<head>	<head>
	<script>
	var targetwin = opener;
	var queue = '';
	</script>
<title>LON-CAPA Digital Library Search Results</title>	<title>LON-CAPA Digital Library Search Results</title>
</head>	</head>
<frameset rows="150,*">	<frameset rows="150,*">
Line 2302 extra custom metadata to show.	Line 2635 extra custom metadata to show.
######################################################################	######################################################################
######################################################################	######################################################################
sub detailed_citation_view {	sub detailed_citation_view {
my %values = @_;	my ($prefix,%values) = @_;
my $result=<<END;	my $result=<<END;
<h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	<b>$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'title'}</a></h3>	target='search_preview'>$values{'title'}</a></b>
<p>	<p>
<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />	<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />

Line 2320 $values{'extrashow'}	Line 2653 $values{'extrashow'}
<p>	<p>
$values{'shortabstract'}	$values{'shortabstract'}
</p>	</p>
	<hr align='left' width='200' noshade />
END	END
return $result;	return $result;
}	}
Line 2335 END	Line 2669 END
######################################################################	######################################################################
######################################################################	######################################################################
sub summary_view {	sub summary_view {
my %values = @_;	my ($prefix,%values) = @_;
my $result=<<END;	my $result=<<END;
<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'author'}</a><br />	target='search_preview'>$values{'author'}</a><br />
$values{'title'}<br />	$values{'title'}<br />
$values{'owner'} -- $values{'lastrevisiondate'}<br />	$values{'owner'} -- $values{'lastrevisiondate'}<br />
$values{'copyrighttag'}<br />	$values{'copyrighttag'}<br />
$values{'extrashow'}	$values{'extrashow'}
</p>	</p>
	<hr align='left' width='200' noshade />
	END
	return $result;
	}

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

	=pod

	=item &compact_view()

	=cut

	######################################################################
	######################################################################
	sub compact_view {
	my ($prefix,%values) = @_;
	my $result=<<END;
	$prefix <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" target='search_preview'>
	$values{'title'}</a>
	<b>$values{'author'}</b><br />
END	END
return $result;	return $result;
}	}


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

Line 2360 END	Line 2717 END
######################################################################	######################################################################
######################################################################	######################################################################
sub fielded_format_view {	sub fielded_format_view {
my %values = @_;	my ($prefix,%values) = @_;
my $result=<<END;	my $result=<<END;
	$prefix
<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	<b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'url'}</a>	target='search_preview'>$values{'url'}</a>
<br />	<br />
Line 2380 sub fielded_format_view {	Line 2738 sub fielded_format_view {
<b>Abstract:</b> $values{'shortabstract'}<br />	<b>Abstract:</b> $values{'shortabstract'}<br />
$values{'extrashow'}	$values{'extrashow'}
</p>	</p>
	<hr align='left' width='200' noshade />
END	END
return $result;	return $result;
}	}
Line 2398 END	Line 2757 END
######################################################################	######################################################################
######################################################################	######################################################################
sub xml_sgml_view {	sub xml_sgml_view {
my %values = @_;	my ($prefix,%values) = @_;
my $result=<<END;	my $result=<<END;
	$prefix
<pre>	<pre>
<LonCapaResource>	<LonCapaResource>
<url>$values{'url'}</url>	<url>$values{'url'}</url>
Line 2428 sub xml_sgml_view {	Line 2788 sub xml_sgml_view {
</LonCapaResource>	</LonCapaResource>
</pre>	</pre>
$values{'extrashow'}	$values{'extrashow'}
	<hr align='left' width='200' noshade />
END	END
return $result;	return $result;
}	}
Line 2460 sub filled {	Line 2821 sub filled {

=item &output_blank_field_error()	=item &output_blank_field_error()

	Output a complete page that indicates the user has not filled in enough
	information to do a search.

	Inputs: $r (Apache request handle), $closebutton, $parms.

	Returns: nothing

	$parms is extra information to include in the 'Revise search request' link.

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub output_blank_field_error {	sub output_blank_field_error {
my ($r,$closebutton)=@_;	my ($r,$closebutton,$parms)=@_;
# make query information persistent to allow for subsequent revision	# make query information persistent to allow for subsequent revision
$r->print(<<BEGINNING);	$r->print(<<BEGINNING);
<html>	<html>
Line 2474 sub output_blank_field_error {	Line 2844 sub output_blank_field_error {
BEGINNING	BEGINNING
$r->print(<<RESULTS);	$r->print(<<RESULTS);
</head>	</head>
<body bgcolor="#ffffff">	$bodytag
<img align='right' src='/adm/lonIcons/lonlogos.gif' />	<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>	<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
$hidden_fields	$hidden_fields
<a href="/adm/searchcat?persistent_db_id=$ENV{'form.persistent_db_id'}"	<a href="/adm/searchcat?$parms&persistent_db_id=$ENV{'form.persistent_db_id'}"
>Revise search request</a>	>Revise search request</a>
$closebutton	$closebutton
<hr />	<hr />
<h3>Helpful Message</h3>	<h3>Unactionable search query.</h3>
<p>	<p>
Incorrect search query due to blank entry fields.	You did not fill in enough information for the search to be started.
You need to fill in the relevant	You need to fill in relevant fields on the search page in order
fields on the search page in order for a query to be	for a query to be processed.
processed.
</p>	</p>
</body>	</body>
</html>	</html>
Line 2522 sub output_date_error {	Line 2891 sub output_date_error {
<head>	<head>
<title>The LearningOnline Network with CAPA</title>	<title>The LearningOnline Network with CAPA</title>
</head>	</head>
<body bgcolor="#ffffff">	$bodytag
<img align='right' src='/adm/lonIcons/lonlogos.gif' />	<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Search Catalog</h1>	<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
Line 2531 $hidden_fields	Line 2900 $hidden_fields
onClick='this.form.submit();' />	onClick='this.form.submit();' />
$closebutton	$closebutton
<hr />	<hr />
<h3>Helpful Message</h3>	<h3>Error</h3>
<p>	<p>
$message	$message
</p>	</p>

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

Removed from v.1.146
changed lines
	Added in v.1.158