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.145 and 1.150

version 1.145, 2002/07/28 20:02:14	version 1.150, 2002/08/01 14:11:57
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 140 my $diropendb = ""; # db file	Line 132 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,
my $persistent_db_file;	"Compact View" => \&compact_view);
my %persistent_db;	my %persistent_db;
my $hidden_fields;	my $hidden_fields;
######################################################################	######################################################################
Line 172 string that holds portions of the screen	Line 164 string that holds portions of the screen
sub handler {	sub handler {
my $r = shift;	my $r = shift;
#	#
untie %groupsearch_db if (tied(%groupsearch_db));
#
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 185 sub handler {	Line 175 sub handler {
## 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',	['catalogmode','launch','acts','mode','form','element','pause',
'reqinterface','persistent_db_id','table']);	'phase','persistent_db_id','table','start','show']);
	##
	## 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
	## printing the results. We only need (theoretically) to do
	## this once, so the pause indicator is deleted
	##
	if (exists($ENV{'form.pause'})) {
	sleep(3);
	delete($ENV{'form.pause'});
	}
##	##
## Initialize global variables	## Initialize global variables
##	##
Line 195 sub handler {	Line 195 sub handler {
"\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";	"\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";
#	#
# 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;
}	}
$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';
#	##
# Read in the database. It should (hopefully) not be catastrophic to	if (! &get_persistent_form_data($r,$persistent_db_file)) {
# fail in this exercise.	if ($ENV{'form.phase'} =~ /(run_search\|results)/) {
if (-e $persistent_db_file) {	&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".
# Read in the previous values, if we can.	"from $persistent_db_file");
if (tie(%persistent_db,'GDBM_File',$persistent_db_file,	$r->print(<<END);
&GDBM_READER,0640)) {	<html>
&reconstruct_persistent_form_data($r);	<head><title>LON-CAPA Search Error</title></head>
untie (%persistent_db);	<body>
}	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
##	##
if ($ENV{'form.launch'} eq '1') {	untie %groupsearch_db if (tied(%groupsearch_db));
if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {	if ($ENV{'form.launch'} eq '1' &&
	($ENV{'form.catalogmode'} eq 'groupsearch') &&
	($ENV{'form.phase'} eq 'results')) {
	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
&start_fresh_session();	&start_fresh_session();
untie %groupsearch_db;	untie %groupsearch_db;
} else {	} else {
Line 229 sub handler {	Line 239 sub handler {
}	}
}	}
##	##
## 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()'>
END	END
	} else {
	$closebutton = '';
	$importbutton = '';
}	}
##	##
## Do a search, if needed.	## Sanity checks on form elements
##	##
my $searchtype;	if (!defined($ENV{'form.viewselect'})) {
$searchtype = 'Basic' if ($ENV{'form.basicsubmit'} eq 'SEARCH');	if (($ENV{'form.catalogmode'} eq 'groupsearch') \|\|
$searchtype = 'Advanced' if ($ENV{'form.advancedsubmit'} eq 'SEARCH');	($ENV{'form.catalogmode'} eq 'interactive')) {
if ($searchtype) {	$ENV{'form.viewselect'} ="Compact View";
##	} else {
## make query information persistent to allow for subsequent revision	$ENV{'form.viewselect'} ="Detailed Citation View";
##	}
tie(%persistent_db,'GDBM_File',$persistent_db_file,&GDBM_WRCREAT,0640);	}
&make_persistent(\%ENV);	$ENV{'form.phase'} = 'disp_basic' if (! exists($ENV{'form.phase'}));
untie(%persistent_db);	##
	## Switch on the phase
	##
	if ($ENV{'form.phase'} eq 'disp_basic') {
	&print_basic_search_form($r,$closebutton);
	} elsif ($ENV{'form.phase'} eq 'disp_adv') {
	&print_advanced_search_form($r,$closebutton);
	} elsif ($ENV{'form.phase'} eq 'results') {
	&display_results($r,$importbutton,$closebutton);
	} elsif($ENV{'form.phase'} eq 'run_search') {
	my ($query,$customquery,$customshow,$libraries,$pretty_string) =
	&get_persistent_data($persistent_db_file,
	['query','customquery','customshow',
	'libraries','pretty_string']);
	&run_search($r,$query,$customquery,$customshow,
	$libraries,$pretty_string);
	} elsif(($ENV{'form.phase'} eq 'basic_search') \|\|
	($ENV{'form.phase'} eq 'adv_search')) {
	# Set up table
	if (! defined(&create_results_table())) {
	$r->print(<<END);
	<html><head><title>Search Error</title></head>
	<body>
	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)) {
	$r->print(<<END);
	<html><head><title>Search Error</title></head>
	<body>
	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
my ($query,$customquery,$customshow,$libraries) =	my ($query,$customquery,$customshow,$libraries) =
(undef,undef,undef,undef);	(undef,undef,undef,undef);
my $pretty_string;	my $pretty_string;
if ($searchtype eq 'Basic') {	if ($ENV{'form.phase'} eq 'basic_search') {
($query,$pretty_string) = &parse_basic_search($r,$closebutton);	($query,$pretty_string) = &parse_basic_search($r,$closebutton);
} elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {	} else { # Advanced search
($query,$customquery,$customshow,$libraries,$pretty_string)	($query,$customquery,$customshow,$libraries,$pretty_string)
= &parse_advanced_search($r,$closebutton);	= &parse_advanced_search($r,$closebutton);
return OK if (! defined($query));	return OK if (! defined($query));
}	}
# Output some information to the user.	&make_persistent($r,
$r->print(&search_results_header($searchtype,$pretty_string));	{ query => $query,
$r->print("Sending search request to LON-CAPA servers.<br />\n");	customquery => $customquery,
$r->rflush();	customshow => $customshow,
&run_search($r,$query,$customquery,$customshow,$libraries);	libraries => $libraries,
	pretty_string => $pretty_string },
	$persistent_db_file);
##	##
## Display the results	## Print out the frames interface
##
&display_results($r,$searchtype,$importbutton,$closebutton);
$r->rflush();
} else {
#
# Set the default view if it is not already set.
if (!defined($ENV{'form.viewselect'})) {
$ENV{'form.viewselect'} ="Detailed Citation View";
}
#
# remove the requested interface from the environment.
my $interface;
if ($ENV{'form.reqinterface'}) {
$interface = lc($ENV{'form.reqinterface'});
} else {
$interface = 'basic';
}
##	##
## Determine course of action	&print_frames_interface($r);
##
if ($interface eq 'display') {
# &display_results($closebutton));
} elsif ($interface eq 'advanced') {
$r->print(&advanced_search_form($closebutton));
} elsif ($interface eq 'basic') {
# Output normal search interface
$r->print(&basic_search_form($closebutton));
}
}	}
untie (%persistent_db);
return OK;	return OK;
}	}

Line 315 END	Line 371 END

=pod	=pod

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

Returns a scalar which holds html for the basic search form.	Returns a scalar which holds html for the basic search form.

Line 324 Returns a scalar which holds html for th	Line 380 Returns a scalar which holds html for th
######################################################################	######################################################################
######################################################################	######################################################################

sub basic_search_form{	sub print_basic_search_form{
my ($closebutton) = @_;	my ($r,$closebutton) = @_;
my $scrout=<<"ENDDOCUMENT";	my $scrout=<<"ENDDOCUMENT";
<html>	<html>
<head>	<head>
Line 342 sub basic_search_form{	Line 398 sub basic_search_form{
<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">
	<input type="hidden" name="phase" value="basic_search" />
$hidden_fields	$hidden_fields
<h3>Basic Search</h3>	<h3>Basic Search</h3>
<p>	<p>
Line 354 then press SEARCH below.	Line 411 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?reqinterface=advanced">Advanced Search</a></td></tr>	</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr>
<tr><td>$checkbox use related words</td><td></td></tr>	<tr><td>$checkbox use related words</td><td></td></tr>
</table>	</table>
</p>	</p>
Line 377 END	Line 432 END
</body>	</body>
</html>	</html>
ENDDOCUMENT	ENDDOCUMENT
return $scrout;	$r->print($scrout);
	return;
}	}
######################################################################	######################################################################
######################################################################	######################################################################
Line 393 Returns a scalar which holds html for th	Line 449 Returns a scalar which holds html for th
######################################################################	######################################################################
######################################################################	######################################################################

sub advanced_search_form{	sub print_advanced_search_form{
my ($closebutton) = @_;	my ($r,$closebutton) = @_;
my $advanced_buttons = <<"END";	my $advanced_buttons = <<"END";
<p>	<p>
<input type="submit" name="advancedsubmit" value='SEARCH' />	<input type="submit" name="advancedsubmit" value='SEARCH' />
Line 427 such as AND, OR, or NOT.<br />	Line 483 such as AND, OR, or NOT.<br />
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
$advanced_buttons	$advanced_buttons
$hidden_fields	$hidden_fields
	<input type="hidden" name="phase" value="adv_search" />
<table>	<table>
<tr><td><font color="#800000" face="helvetica"><b>VIEW:</b></font></td>	<tr><td><font color="#800000" face="helvetica"><b>VIEW:</b></font></td>
<td>	<td>
Line 568 $advanced_buttons	Line 625 $advanced_buttons
</body>	</body>
</html>	</html>
ENDDOCUMENT	ENDDOCUMENT
return $scrout;	$r->print($scrout);
	return;
}	}

######################################################################	######################################################################
Line 576 ENDDOCUMENT	Line 634 ENDDOCUMENT

=pod	=pod

=item &reconstruct_persistent_form_data	=item &get_persistent_form_data

This function is the reverse of &make_persistent();	Inputs: filename of database

	Outputs: returns undef on database errors.

	This function is the reverse of &make_persistent() for form data.
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 a form value already exists in $ENV, it will not be
returned value will be an array pointer. Items will be returned in the	overwritten. Form values that are array references may have values appended
environment in $ENV{"form.$name"}.	to them.

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub reconstruct_persistent_form_data {	sub get_persistent_form_data {
foreach my $name (keys %persistent_db) {	my $r = shift;
# &Apache::lonnet::logthis("Reconstructing $name = $persistent_db{$name}");	my $filename = shift;
my @Values = split(',',$persistent_db{$name});	return 0 if (! -e $filename);
my @value = map { &Apache::lonnet::unescape($_) } @Values;	return undef if (! tie(%persistent_db,'GDBM_File',$filename,
$name = 'form.'.$name;	&GDBM_READER(),0640));
	#
	# These make sure we do not get array references printed out as 'values'.
	my %arrays_allowed = ('form.category'=>1,'form.domains'=>1);
	#
	# Loop through the keys, looking for 'form.'
	foreach my $name (keys(%persistent_db)) {
	next if ($name !~ /^form./);
	my @values = map {
	&Apache::lonnet::unescape($_);
	} split(',',$persistent_db{$name});
	next if (@values <1);
if (exists($ENV{$name})) {	if (exists($ENV{$name})) {
if (ref($ENV{$name})) {	if (ref($ENV{$name}) eq 'ARRAY') {
# Assume it is an array reference	# If it is an array, tack @values on the end of it.
$ENV{$name} = [@{$ENV{$name}},@value];	$ENV{$name} = [@$ENV{$name},@values];
} else {	} elsif (! ref($ENV{$name}) && $arrays_allowed{$name}) {
$ENV{$name} = [$ENV{$name},@value];	# 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 (@value > 1) {	if ($arrays_allowed{$name}) {
$ENV{$name} = [@value];	$ENV{$name} = [@values];
} else {	} else {
$ENV{$name} = $value[0];	$ENV{$name} = $values[0] if ($values[0]);
}	}
}	}
}	}
return;	untie (%persistent_db);
	return 1;
	}
	######################################################################
	######################################################################

	=pod

	=item &get_persistent_data

	Inputs: filename of database, ref to array of values to recover.

	Outputs: array of values. Returns undef on error.

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

	=cut

	######################################################################
	######################################################################
	sub get_persistent_data {
	my $filename = shift;
	my @Vars = @{shift()};
	my @Values; # Return array
	return undef if (! -e $filename);
	return undef if (! tie(%persistent_db,'GDBM_File',$filename,
	&GDBM_READER(),0640));
	foreach my $name (@Vars) {
	if (! exists($persistent_db{$name})) {
	push @Values, undef;
	next;
	}
	my @values = map {
	&Apache::lonnet::unescape($_);
	} split(',',$persistent_db{$name});
	if (@values == 1) {
	push @Values,$values[0];
	} else {
	push @Values,\@values;
	}
	}
	untie (%persistent_db);
	return @Values;
}	}

######################################################################	######################################################################
Line 619 sub reconstruct_persistent_form_data {	Line 738 sub reconstruct_persistent_form_data {

=item &make_persistent()	=item &make_persistent()

Store (environment) variables away to the %persistent_db.	Inputs: Hash of values to save, filename of persistent database.

	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 seperated string.	elements escaped and concatenated in a comma seperated string.

Line 628 elements escaped and concatenated in a c	Line 749 elements escaped and concatenated in a c
######################################################################	######################################################################
######################################################################	######################################################################
sub make_persistent {	sub make_persistent {
	my $r = shift;
my %save = %{shift()};	my %save = %{shift()};
foreach my $name (keys %save) {	my $filename = shift;
next if ($name !~ /^form\./ \|\| $name =~ /submit/);	return undef if (! tie(%persistent_db,'GDBM_File',
	$filename,&GDBM_WRCREAT(),0640));
	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 );
$name=~s/^form\.//;
$persistent_db{$name} = $store;	$persistent_db{$name} = $store;
}	}
return '';	untie(%persistent_db);
	return 1;
	}

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

	=pod

	=item &make_form_data_persistent()

	Inputs: filename of persistent database.

	Store most form variables away to the %persistent_db.
	Values will be escaped. Values that are array pointers will have their
	elements escaped and concatenated in a comma seperated string.

	=cut

	######################################################################
	######################################################################
	sub make_form_data_persistent {
	my $r = shift;
	my $filename = shift;
	my %save;
	foreach (keys(%ENV)) {
	next if (!/^form/ \|\| /submit/);
	$save{$_} = $ENV{$_};
	}
	return &make_persistent($r,\%save,$filename);
}	}

######################################################################	######################################################################
Line 1416 the following format:	Line 1570 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 => 'INT',
Line 1444 my %Datatypes =	Line 1596 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 author subject abstract mime language owner copyright/;

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

	=pod

	=item &create_results_table()

	Creates the table of search results by calling lonmysql. Stores the
	table id in $ENV{'form.table'}

	Inputs: none.

	Returns: the identifier of the table on success, undef on error.

	=cut

	######################################################################
	######################################################################
	sub create_results_table {
	my $table = &Apache::lonmysql::create_table
	( { columns => \%Datatypes,
	column_order => \@DataOrder,
	fullindex => \@Fullindicies,
	} );
	if (defined($table)) {
	$ENV{'form.table'} = $table;
	return $table;
	}
	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) = @_;
$r->print("<pre>".$string."</pre>\n");	$text =~ s/\'/\\\'/g;
	$r->print
	("<script>document.statusform.count.value = ' $text'</script>\n");
	$r->rflush();
	}

	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();	$r->rflush();
return;
}	}

######################################################################	######################################################################
Line 1484 sub write_status {	Line 1697 sub write_status {
######################################################################	######################################################################
######################################################################	######################################################################
sub run_search {	sub run_search {
my ($r,$query,$customquery,$customshow,$serverlist) = @_;	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 = 120; # seconds for the search to complete
#	#
	# Print run_search header
	#
	$r->print("<html><head><title>Search Status</title></head><body>");
	$r->print("Search: ".$pretty_string."\n");
	$r->rflush();
	#
# Determine the servers we need to contact.	# Determine the servers we need to contact.
#	#
my @Servers_to_contact;	my @Servers_to_contact;
Line 1500 sub run_search {	Line 1720 sub run_search {
@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'};
# Create Table	if (! defined($table) \|\| $table eq '' \|\| $table =~ /\D/ ) {
#	$r->print("Unable to determine table id to store search results in.".
my $table = &Apache::lonmysql::create_table	"The search has been aborted.</body></html>");
( { columns => \%Datatypes,	return;
column_order => \@DataOrder,	}
} );	my $table_status = &Apache::lonmysql::check_table($table);
if (! defined($table)) {	if (! defined($table_status)) {
# What do I do now? Print out an error page.	$r->print("Unable to determine status of table.</body></html>");
&Apache::lonnet::logthis("lonmysql attempted to create a table ".	&Apache::lonnet::logthis("Bogus table id of $table for ".
"and this was the result:".	"$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;
}	}
##	##
## form.table needs to be stored in the persistent database...	## Prepare for the big loop.
##	##
$ENV{'form.table'}=$table;
#
# Prepare for the big loop.
#
my $hitcountsum;	my $hitcountsum;
my $server;	my $server;
my $status;	my $status;
while ((time - $starttime < $max_time) &&	$r->print(<<END);
	<form name="statusform" action="" method="post">
	<input type="hidden" name="Queue" value="" />
	<table>
	<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</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>
	</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 1537 sub run_search {	Line 1773 sub run_search {
$customshow,[$server]);	$customshow,[$server]);
($server) = keys(%$reply);	($server) = keys(%$reply);
$Server_status{$server} = $reply->{$server};	$Server_status{$server} = $reply->{$server};
# &write_status($r,"Contacted:$server:reply:".	&update_status($r,'contacting '.$server);
# $Server_status{$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});
# &write_status($r,"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);
# &write_status($r,"$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...	$r->print("Unable to open search results file for ".
# Tell the user and exit...?
# Should I give up on opening it?
&write_status("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 1587 sub run_search {	Line 1821 sub run_search {
# Store the result in the mysql database	# Store the result in the mysql database
my $result = &Apache::lonmysql::store_row($table,\%Fields);	my $result = &Apache::lonmysql::store_row($table,\%Fields);
if (! defined($result)) {	if (! defined($result)) {
&write_status($r,&Apache::lonmysql::get_error());	$r->print(&Apache::lonmysql::get_error());
}	}
# &write_status($r,&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});
#&write_status($r,"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);
&Apache::lonmysql::disconnect_from_db();	&Apache::lonmysql::disconnect_from_db();
# Let the user know	# 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.
&write_status($r,"Search completed.");	$r->print("<b>Search Completed.</b>  ");
if ($hitcountsum) {	if ($hitcountsum) {
&write_status($r,$hitcountsum." successful matches to your query.");	$r->print($hitcountsum." matches were found.");
} else {	} else {
&write_status($r,"There were no successful matches to your query.");	$r->print("There were no successful matches to your query.");
}	}
	$r->print("</body></html>");
return;	return;
}	}

Line 1620 sub run_search {	Line 1870 sub run_search {
######################################################################	######################################################################
=pod	=pod

=item &display_buttons	=item &prev_next_buttons

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub display_buttons {	sub prev_next_buttons {
my ($current_min,$show,$total,$parms) = @_;	my ($current_min,$show,$total,$parms) = @_;
return '' if ($show eq 'all'); # No links if you get them all at once.	return '' if ($show eq 'all'); # No links if you get them all at once.
my $links;	my $links;
Line 1636 sub display_buttons {	Line 1886 sub display_buttons {
$prev_min = 0 if $prev_min < 0;	$prev_min = 0 if $prev_min < 0;
if ($prev_min < $current_min) {	if ($prev_min < $current_min) {
$links .= qq{	$links .= qq{
<a href="/adm/searchcat?$parms&startwith=$prev_min&show=$show">prev</a>	<a href="/adm/searchcat?$parms&start=$prev_min&show=$show">prev</a>
};	};
	} else {
	$links .= 'prev';
}	}
##	##
## Pages.... Someday.	## Pages.... Someday.
##	##
	$links .= qq{
	<a href="/adm/searchcat?$parms&start=$current_min&$show=$show">reload</a>
	};
##	##
## Next	## Next
my $next_min = $current_min + $show;	my $next_min = $current_min + $show;
my $next_min = $current_min if ($next_min > $total);	$next_min = $current_min if ($next_min > $total);
if ($next_min != $current_min) {	if ($next_min != $current_min) {
$links .= qq{	$links .= qq{
<a href="/adm/searchcat?$parms&startwith=$next_min&show=$show">next</a>	<a href="/adm/searchcat?$parms&start=$next_min&show=$show">next</a>
};	};
	} else {
	$links .= ' next';
}	}
return $links;	return $links;
}	}
Line 1666 sub display_buttons {	Line 1922 sub display_buttons {
######################################################################	######################################################################
######################################################################	######################################################################
sub display_results {	sub display_results {
my ($r,$mode,$importbutton,$closebutton) = @_;	my ($r,$importbutton,$closebutton) = @_;
	my $connection = $r->connection;
	$r->print(&search_results_header($importbutton,$closebutton));
##	##
## Set viewing function	## Set viewing function
##	##
Line 1679 sub display_results {	Line 1937 sub display_results {
##	##
## Get the catalog controls setup	## Get the catalog controls setup
##	##
my $action = "/adm/searchcat";	my $action = "/adm/searchcat?phase=results";
if ($mode eq 'Basic') {	##
$action .= "?reqinterface=basic";	## Deal with groupsearch
} elsif ($mode eq 'Advanced') {	##
$action .= "?reqinterface=advanced";	if ($ENV{'form.catalogmode'} eq 'groupsearch') {
	if (! tie(%groupsearch_db,'GDBM_File',$diropendb,
	&GDBM_WRCREAT(),0640)) {
	$r->print('Unable to store import results.</form></body></html>');
	$r->rflush();
	return;
	}
}	}
$r->print(<<CATALOGCONTROLS);
<form name='results' method="post" action="$action">
$hidden_fields
<input type='hidden' name='acts' value='' />
<input type='button' value='Revise search request'
onClick='this.form.submit();' />
$importbutton
$closebutton
<hr />
CATALOGCONTROLS
if (! tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
$r->print('Unable to tie hash to db file</body></html>');
$r->rflush();
return;
}
##	##
## 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();	my $connection_result = &Apache::lonmysql::connect_to_db();
if (!defined($connection_result)) {	if (!defined($connection_result)) {
&write_status($r,&Apache::lonmysql::get_error());	$r->print(&Apache::lonmysql::get_error());
}	}
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.</body></html>");	$r->print("A MySQL error has occurred.</form></body></html>");
&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;	return;
Line 1725 CATALOGCONTROLS	Line 1974 CATALOGCONTROLS
##	##
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());	&Apache::lonnet::logthis(&Apache::lonmysql::get_debug());
return;	return;
}	}
if ($total_results == 0) {
$r->print("There were no results matching your query.\n".
"</form></body></html>");
return;
}
##	##
## Determine how many results we need to get	## Determine how many results we need to get
##	##
$ENV{'form.startwith'} = 0 if (! exists($ENV{'form.startwith'}));	$ENV{'form.show'} = 20;
	$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.startwith'};	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'};
	$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>'.
	&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"
	);
	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
##	##
Line 1762 CATALOGCONTROLS	Line 2023 CATALOGCONTROLS
## 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'});
# 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 1797 $ENV{'form.catalogmode'}. Stores data i	Line 2072 $ENV{'form.catalogmode'}. Stores data i
######################################################################	######################################################################
######################################################################	######################################################################
{	{
my $fnum;	my $fnum = 0;

sub catalogmode_output {	sub catalogmode_output {
my $output = '';	my $output = '';
my ($title,$url) = @_;	my ($title,$url) = @_;
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 1811 onClick="javascript:select_data('$title'	Line 2086 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;
Line 2024 Checked for existance & 'edit' mode.	Line 2297 Checked for existance & 'edit' mode.
######################################################################	######################################################################
######################################################################	######################################################################
sub search_results_header {	sub search_results_header {
my ($mode,$pretty_query) = @_;	my ($importbutton,$closebutton) = @_;
$mode = lc($mode);
my $title;
if ($mode eq 'advanced') {
$title = "Advanced Search Results";
} elsif ($mode eq 'basic') {
$title = "Basic Search Results";
}
my $result = '';	my $result = '';
# output beginning of search page	# output beginning of search page
$result.=<<BEGINNING;
<html>
<head>
<title>$title</title>
BEGINNING
# conditional output of script functions dependent on the mode in	# conditional output of script functions dependent on the mode in
# which the search was invoked	# which the search was invoked
if ($ENV{'form.catalogmode'} eq 'interactive'){	if ($ENV{'form.catalogmode'} eq 'interactive'){
Line 2048 BEGINNING	Line 2309 BEGINNING
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 (opener.inf.document.forms.resinfo.elements.t) {
Line 2069 SCRIPT	Line 2330 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 2087 SCRIPT	Line 2348 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) {
// alert('DEBUG: Should be storing '+title+' and '+url);
}
function queue(val) {	function queue(val) {
if (eval("document.forms.results.returnvalues["+val+"].checked")) {	if (document.forms.results.returnvalues[val].checked) {
document.forms.results.acts.value+='1a'+val+'b';	parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
}	} else {
else {	parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
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
$result.=<<SCRIPT;
<script type="text/javascript">
function displayinfo(val) {
popwin.document.forms.popremain.sdetails.value=val;
}
function openhelp(val) {
openhelpwin=open('/adm/help/searchcat.html','helpscreen',
'scrollbars=1,width=400,height=300');
openhelpwin.focus();
}
function abortsearch(val) {
popwin.close();
}	}
</script>	</script>
SCRIPT	SCRIPT
$result.=<<END;	$result.=<<END;
</head>	</head>
<body bgcolor="#ffffff">	<form name="results" method="post" action="" >
<img align=right src=/adm/lonIcons/lonlogos.gif>	<input type="hidden" name="Queue" value="" />
<h1>$title</h1>	$importbutton
END	END
if ($pretty_query) {
$result .= "<p>Search query: $pretty_query</p>";
}
return $result;	return $result;
}	}

######################################################################	######################################################################
######################################################################	######################################################################
	sub search_status_header {
	return <<ENDSTATUS;
	<html><head><title>Search Status</title></head>
	<body>
	<h3>Search Status</h3>
	Sending search request to LON-CAPA servers.<br />
	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=10"."&start=0"."&show=20";
	return $results_link;
	}

	######################################################################
	######################################################################
	sub print_frames_interface {
	my $r = shift;
	my $basic_link = "/adm/searchcat?"."&table=".$ENV{'form.table'}.
	"&persistent_db_id=".$ENV{'form.persistent_db_id'};
	my $run_search_link = $basic_link."&phase=run_search";
	my $results_link = &results_link();
	my $result = <<"ENDFRAMES";
	<html>
	<head>
	<script>
	var targetwin = opener;
	</script>
	<title>LON-CAPA Digital Library Search Results</title>
	</head>
	<frameset rows="150,*">
	<frame name="statusframe" src="$run_search_link">
	<frame name="resultsframe" src="$results_link">
	</frameset>
	</html>
	ENDFRAMES

	$r->print($result);
	return;
	}

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

=pod	=pod

Line 2154 extra custom metadata to show.	Line 2439 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 2172 $values{'extrashow'}	Line 2457 $values{'extrashow'}
<p>	<p>
$values{'shortabstract'}	$values{'shortabstract'}
</p>	</p>
	<hr align='left' width='200' noshade />
END	END
return $result;	return $result;
}	}
Line 2184 END	Line 2470 END
=item &summary_view()	=item &summary_view()

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
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	END
return $result;	return $result;
}	}
Line 2206 END	Line 2492 END

=pod	=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
	return $result;
	}


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

	=pod

=item &fielded_format_view()	=item &fielded_format_view()

=cut	=cut
Line 2213 END	Line 2521 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 2233 sub fielded_format_view {	Line 2542 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 2251 END	Line 2561 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 2281 sub xml_sgml_view {	Line 2592 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 2332 BEGINNING	Line 2644 BEGINNING
<h1>Search Catalog</h1>	<h1>Search Catalog</h1>
<form method="post" action="/adm/searchcat">	<form method="post" action="/adm/searchcat">
$hidden_fields	$hidden_fields
<input type='button' value='Revise search request'	<a href="/adm/searchcat?persistent_db_id=$ENV{'form.persistent_db_id'}"
onClick='this.form.submit();' />	>Revise search request</a>
$closebutton	$closebutton
<hr />	<hr />
<h3>Helpful Message</h3>	<h3>Helpful Message</h3>

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

Removed from v.1.145
changed lines
	Added in v.1.150