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.150 and 1.154

version 1.150, 2002/08/01 14:11:57	version 1.154, 2002/08/21 17:18:08
Line 206 sub handler {	Line 206 sub handler {
'_'.&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';
##	##
if (! &get_persistent_form_data($r,$persistent_db_file)) {	if (! &get_persistent_form_data($persistent_db_file)) {
if ($ENV{'form.phase'} =~ /(run_search\|results)/) {	if ($ENV{'form.phase'} =~ /(run_search\|results)/) {
&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".	&Apache::lonnet::logthis("lonsearchcat:Unable to recover data ".
"from $persistent_db_file");	"from $persistent_db_file");
Line 298 END	Line 298 END
}	}
}	}
$ENV{'form.phase'} = 'disp_basic' 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 307 END	Line 308 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']);
&run_search($r,$query,$customquery,$customshow,	if ($ENV{'form.phase'} eq 'sort') {
$libraries,$pretty_string);	&print_sort_form($r,$pretty_string);
	} elsif ($ENV{'form.phase'} eq 'run_search') {
	&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())) {
$r->print(<<END);	$r->print(<<END);
Line 351 END	Line 360 END
= &parse_advanced_search($r,$closebutton);	= &parse_advanced_search($r,$closebutton);
return OK if (! defined($query));	return OK if (! defined($query));
}	}
&make_persistent($r,	&make_persistent({ query => $query,
{ query => $query,
customquery => $customquery,	customquery => $customquery,
customshow => $customshow,	customshow => $customshow,
libraries => $libraries,	libraries => $libraries,
Line 382 Returns a scalar which holds html for th	Line 390 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 394 sub print_basic_search_form{	Line 403 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 425 END	Line 431 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 462 END	Line 472 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 474 END	Line 485 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 492 ENDHEADER	Line 500 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 600 LASTREVISIONDATEEND	Line 615 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 651 to them.	Line 666 to them.
######################################################################	######################################################################
######################################################################	######################################################################
sub get_persistent_form_data {	sub get_persistent_form_data {
my $r = shift;
my $filename = shift;	my $filename = shift;
return 0 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,
Line 663 sub get_persistent_form_data {	Line 677 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]);
}
}	}
}	}
untie (%persistent_db);	untie (%persistent_db);
Line 721 sub get_persistent_data {	Line 726 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 749 elements escaped and concatenated in a c	Line 754 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 );
Line 791 sub make_form_data_persistent {	Line 793 sub make_form_data_persistent {
next if (!/^form/ \|\| /submit/);	next if (!/^form/ \|\| /submit/);
$save{$_} = $ENV{$_};	$save{$_} = $ENV{$_};
}	}
return &make_persistent($r,\%save,$filename);	return &make_persistent(\%save,$filename);
}	}

######################################################################	######################################################################
Line 1123 sub parse_advanced_search {	Line 1125 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 1137 sub parse_advanced_search {	Line 1140 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 1209 sub parse_advanced_search {	Line 1212 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 1238 sub parse_advanced_search {	Line 1241 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 1294 sub parse_basic_search {	Line 1297 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 1530 sub build_date_queries {	Line 1533 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 1550 sub copyright_check {	Line 1552 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>
	<body>
	<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 1573 my @DataOrder = qw/id title author subje	Line 1721 my @DataOrder = qw/id title author subje
abstract mime lang owner copyright creationdate lastrevisiondate hostname/;	abstract mime lang owner copyright creationdate lastrevisiondate hostname/;

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 1599 my %Datatypes =	Line 1747 my %Datatypes =
);	);

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

######################################################################	######################################################################
######################################################################	######################################################################
Line 1690 sub update_seconds {	Line 1839 sub update_seconds {

=pod	=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'}.
	'&phase='.$revise_phase;
	my $result = qq{<input type="button" value="Revise search" name="revise"} .
	qq{ onClick="parent.location='$newloc';" /> };
	return $result;
	}

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

	=pod

=item &run_search	=item &run_search

=cut	=cut
Line 1703 sub run_search {	Line 1878 sub run_search {
# 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."\n");	<html>
	<head><title>Search Status</title></head>
	<body>
	<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));
}	}
Line 1746 sub run_search {	Line 1938 sub run_search {
my $hitcountsum;	my $hitcountsum;
my $server;	my $server;
my $status;	my $status;
	my $revise = &revise_button();
$r->print(<<END);	$r->print(<<END);
<form name="statusform" action="" method="post">
<input type="hidden" name="Queue" value="" />
<table>	<table>
<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th></tr>	<tr><th>Status</th><th>Total Matches</th><th>Time Remaining</th><th></th></tr>
<tr>	<tr>
<td><input type="text" name="status" value="" size="30" /></td>	<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="count" value="" size="10" /></td>
<td><input type="text" name="seconds" value="" size="8" /></td>	<td><input type="text" name="seconds" value="" size="8" /></td>
	<td>$revise</td>
</tr>	</tr>
</table>	</table>
</form>	</form>
Line 1851 END	Line 2043 END
}	}
}	}
&update_status($r,'Search Complete'.$server);	&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("<b>Search Completed.</b>  ");
if ($hitcountsum) {
$r->print($hitcountsum." matches were found.");
} else {
$r->print("There were no successful matches to your query.");
}
$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 1883 sub prev_next_buttons {	Line 2075 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 1953 sub display_results {	Line 2145 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.</form></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
##	##
Line 1978 sub display_results {	Line 2155 sub display_results {
&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;	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);
}	}
##	##
Line 2018 sub display_results {	Line 2193 sub display_results {
## 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.
##	##
Line 2312 sub search_results_header {	Line 2487 sub search_results_header {
parent.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 2386 sub results_link {	Line 2561 sub results_link {
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 $results_link = $basic_link."&phase=results".	my $results_link = $basic_link."&phase=results".
"&pause=10"."&start=0"."&show=20";	"&pause=1"."&start=1";
return $results_link;	return $results_link;
}	}

Line 2625 sub filled {	Line 2800 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 2644 BEGINNING	Line 2828 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
<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 2696 $hidden_fields	Line 2879 $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.150
changed lines
	Added in v.1.154