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.129 and 1.134

version 1.129, 2002/06/25 15:08:59	version 1.134, 2002/07/03 19:11:09
Line 107 button that closes the search window	Line 107 button that closes the search window

=item $importbutton	=item $importbutton

button to take the selecte results and go to group sorting	button to take the select results and go to group sorting

=item %hash	=item %hash

Line 212 END	Line 212 END
onClick='javascript:select_group()'>	onClick='javascript:select_group()'>
END	END
}	}
$hidden .= <<END;	$hidden .= &make_persistent({ "form.mode" => $ENV{'form.mode'},
<input type='hidden' name='mode' value='$ENV{'form.mode'}'>	"form.form" => $ENV{'form.form'},
<input type='hidden' name='form' value='$ENV{'form.form'}'>	"form.element" => $ENV{'form.element'},
<input type='hidden' name='element' value='$ENV{'form.element'}'>	"form.date" => 2 });
<input type='hidden' name='date' value='2'>
END
##	##
## What are we doing?	## What are we doing?
##	##
if ($ENV{'form.basicsubmit'} eq 'SEARCH') {	my $searchtype;
# Perform basic search and give results	$searchtype = 'Basic' if ($ENV{'form.basicsubmit'} eq 'SEARCH');
return &basicsearch($r,\%ENV,$hidden);	$searchtype = 'Advanced' if ($ENV{'form.advancedsubmit'} eq 'SEARCH');
} elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {	if ($searchtype) {
# Perform advanced search and give results	my ($query,$customquery,$customshow,$libraries) =
return &advancedsearch($r,\%ENV,$hidden);	(undef,undef,undef,undef);
	if ($searchtype eq 'Basic') {
	$query = &parse_basic_search($r);
	} elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
	($query,$customquery,$customshow,$libraries)
	= &parse_advanced_search($r);
	return OK if (! defined($query));
	}
	# Send query statements over the network to be processed by
	# either the SQL database or a recursive scheme of 'grep'-like
	# actions (for custom metadata).
	$r->rflush();
	my $reply=&Apache::lonnet::metadata_query($query,$customquery,
	$customshow,$libraries);
	&output_results($searchtype,$r,$reply,$hidden);
} elsif ($ENV{'form.reqinterface'} eq 'advanced') {	} elsif ($ENV{'form.reqinterface'} eq 'advanced') {
# Output the advanced interface	# Output the advanced interface
$r->print(&advanced_search_form($closebutton,$hidden));	$r->print(&advanced_search_form($closebutton,$hidden));
return OK;
} else {	} else {
# Output normal search interface	# Output normal search interface
$r->print(&basic_search_form($closebutton,$hidden));	$r->print(&basic_search_form($closebutton,$hidden));
Line 273 sub basic_search_form{	Line 284 sub basic_search_form{
$hidden	$hidden
<h3>Basic Search</h3>	<h3>Basic Search</h3>
<p>	<p>
Enter terms or quoted 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.
</p>	</p>
<p>	<p>
Line 290 ENDDOCUMENT	Line 301 ENDDOCUMENT
<p>	<p>
<input type="submit" name="basicsubmit" value='SEARCH' />	<input type="submit" name="basicsubmit" value='SEARCH' />
$closebutton	$closebutton
<!-- basic view selection -->	<!-- view selection -->
<select name='basicviewselect'>	<select name="viewselect">
<option value='Detailed Citation View' selected="true">	<option value="Detailed Citation View" selected="true" >Detailed Citation View</option>
Detailed Citation View</option>	<option value="Summary View" >Summary View</option>
<option value='Summary View'>Summary View</option>	<option value="Fielded Format">Fielded Format</option>
<option value='Fielded Format'>Fielded Format</option>	<option value="XML/SGML" >XML/SGML</option>
<option value='XML/SGML'>XML/SGML</option>
</select>	</select>
<!-- end of basic view selection -->	<!-- end of view selection -->
<input type="button" value="HELP" onClick="openhelp()" />	<input type="button" value="HELP" onClick="openhelp()" />
</p>	</p>
</form>	</form>
Line 328 sub advanced_search_form{	Line 338 sub advanced_search_form{
<input type="submit" name="advancedsubmit" value='SEARCH' />	<input type="submit" name="advancedsubmit" value='SEARCH' />
<input type="reset" name="reset" value='RESET' />	<input type="reset" name="reset" value='RESET' />
$closebutton	$closebutton
<!-- advance view select -->
<select name='advancedviewselect'>
<option value='Detailed Citation View' selected="true">
Detailed Citation View</option>
<option value='Summary View'>Summary View</option>
<option value='Fielded Format'>Fielded Format</option>
<option value='XML/SGML'>XML/SGML</option>
</select>
<!-- end of advanced view select -->
<input type="button" value="HELP" onClick="openhelp()" />	<input type="button" value="HELP" onClick="openhelp()" />
</p>	</p>
END	END
Line 356 END	Line 357 END
<img align='right' src='/adm/lonIcons/lonlogos.gif' />	<img align='right' src='/adm/lonIcons/lonlogos.gif' />
<h1>Advanced Catalog Search</h1>	<h1>Advanced Catalog Search</h1>
<hr />	<hr />
Enter terms or quoted 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">
$advanced_buttons	$advanced_buttons
$hidden	$hidden
<table>	<table>
	<tr><td><font color="#800000" face="helvetica"><b>VIEW:</b></font></td>
	<td>
	<!-- view selection -->
	<select name="viewselect" size ="1">
	<option value="Detailed Citation View" selected="true">Detailed Citation View</option>
	<option value="Summary View">Summary View</option>
	<option value="Fielded Format">Fielded Format</option>
	<option value="XML/SGML">XML/SGML</option>
	</select>
	<!-- end of view selection -->
	</td></tr>
ENDHEADER	ENDHEADER
$scrout.=&searchphrasefield('title','title',	$scrout.=&searchphrasefield('title','title',
$ENV{'form.title'});	$ENV{'form.title'});
Line 386 ENDHEADER	Line 399 ENDHEADER
$scrout.=&searchphrasefield('publisher<br />owner','owner',	$scrout.=&searchphrasefield('publisher<br />owner','owner',
$ENV{'form.owner'});	$ENV{'form.owner'});
$scrout.="</table>\n";	$scrout.="</table>\n";
# $ENV{'form.mime'}='any' unless length($ENV{'form.mime'});	$ENV{'form.category'}='any' unless length($ENV{'form.category'});
# $scrout.=&selectbox('Limit by MIME type','mime',	$scrout.=&selectbox('File Category','category',
# $ENV{'form.mime'},	$ENV{'form.category'},
# 'any','Any type',	'any','Any category',
# \&{Apache::loncommon::filedescriptionex},	undef,
# (&Apache::loncommon::fileextensions));	(&Apache::loncommon::filecategories()));
$ENV{'form.language'}='any' unless length($ENV{'form.language'});	$ENV{'form.language'}='any' unless length($ENV{'form.language'});
	#----------------------------------------------------------------
	# Allow restriction to multiple domains.
	# I make the crazy assumption that there will never be a domain 'any'.
	#
	$ENV{'form.domains'} = 'any' if (! exists($ENV{'form.domains'}));
	my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}}
	: ($ENV{'form.domains'}) );
	my %domain_hash = ();
	foreach (@allowed_domains) {
	$domain_hash{$_}++;
	}
	my @domains =&Apache::loncommon::get_domains();
	# adjust the size of the select box
	my $size = 4;
	my $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
	# standalone machines do not get to choose a domain to search.
	if ((scalar @domains) == 1) {
	$scrout .='<input type="hidden" name="domains" value="any" />'."\n";
	} else {
	$scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
	'DOMAINS</b></font><br />'.
	'<select name="domains" size="'.$size.'" multiple>'."\n".
	'<option name="any" value="any" '.
	($domain_hash{'any'}? 'selected ' :'').
	'>all domains</option>'."\n";
	foreach my $dom (sort @domains) {
	$scrout.="<option name=\"$dom\" ".
	($domain_hash{$dom} ? 'selected ' :'').">$dom</option>\n";
	}
	$scrout.="</select>\n";
	}
	#----------------------------------------------------------------
	#
	#
$scrout.=&selectbox('Limit by language','language',	$scrout.=&selectbox('Limit by language','language',
$ENV{'form.language'},'any','Any Language',	$ENV{'form.language'},'any','Any Language',
\&{Apache::loncommon::languagedescription},	\&{Apache::loncommon::languagedescription},
Line 491 to be somewhat persistent.	Line 538 to be somewhat persistent.
######################################################################	######################################################################

sub make_persistent {	sub make_persistent {
	my %save = %{shift()};
my $persistent='';	my $persistent='';
foreach (keys %ENV) {	foreach (keys %save) {
if (/^form\./ && !/submit/) {	if (/^form\./ && !/submit/) {
my $name=$_;	my $name=$_;
my $key=$name;	my @values = (ref($save{$name}) ? @{$save{$name}} : ($save{$name}));
$ENV{$key}=~s/\'//g; # do not mess with html field syntax
$name=~s/^form\.//;	$name=~s/^form\.//;
$persistent.=<<END;	foreach (@values) {
<input type="hidden" name="$name" value="$ENV{$key}" />	s/\"/\'/g; # do not mess with html field syntax
	$persistent.=<<END;
	<input type="hidden" name="$name" value="$_" />
END	END
	}
}	}
}	}
return $persistent;	return $persistent;
Line 665 sub selectbox {	Line 715 sub selectbox {
if (! defined($functionref)) { $functionref = sub { $_[0]}; }	if (! defined($functionref)) { $functionref = sub { $_[0]}; }
my $uctitle=uc($title);	my $uctitle=uc($title);
my $selout="\n".'<p><font color="#800000" face="helvetica">'.	my $selout="\n".'<p><font color="#800000" face="helvetica">'.
'<b>'.$uctitle.':</b></font><br /><select name="'.$name.'">';	'<b>'.$uctitle.': </b></font><select name="'.$name.'">';
foreach ($anyvalue,@idlist) {	foreach ($anyvalue,@idlist) {
$selout.='<option value="'.$_.'"';	$selout.='<option value="'.$_.'"';
if ($_ eq $default and !/^any$/) {	if ($_ eq $default and !/^any$/) {
Line 684 sub selectbox {	Line 734 sub selectbox {

=pod	=pod

=item &advancedsearch()	=item &parse_advanced_search()

Parse advanced search results.	Parse advanced search form and return the following:

	=over 4

	=item $query Scalar containing an SQL query.

	=item $customquery Scalar containing a custom query.

	=item $customshow Scalar containing commands to show custom metadata.

	=item $libraries_to_query Reference to array of domains to search.

	=back

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub advancedsearch {	sub parse_advanced_search {
my ($r,$envhash,$hidden)=@_;	my ($r)=@_;
my %ENV=%{$envhash};
my $fillflag=0;	my $fillflag=0;
# Clean up fields for safety	# Clean up fields for safety
for my $field ('title','author','subject','keywords','url','version',	for my $field ('title','author','subject','keywords','url','version',
Line 705 sub advancedsearch {	Line 766 sub advancedsearch {
'lastrevisiondatestart_year','lastrevisiondateend_month',	'lastrevisiondatestart_year','lastrevisiondateend_month',
'lastrevisiondateend_day','lastrevisiondateend_year',	'lastrevisiondateend_day','lastrevisiondateend_year',
'notes','abstract','mime','language','owner',	'notes','abstract','mime','language','owner',
'custommetadata','customshow') {	'custommetadata','customshow','category') {
$ENV{"form.$field"}=~s/[^\w\/\s\=\-\"\']//g;	$ENV{"form.$field"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
foreach ('mode','form','element') {	foreach ('mode','form','element') {
Line 714 sub advancedsearch {	Line 775 sub advancedsearch {
$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});	$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;	$ENV{"form.$_"}=~s/[^\w\/\s\=\-\"\']//g;
}	}
	# Preprocess the category form element.
	if ($ENV{'form.category'} ne 'any') {
	my @extensions = &Apache::loncommon::filecategorytypes
	($ENV{'form.category'});
	$ENV{'form.mime'} = join ' OR ',@extensions;
	}
# Check to see if enough information was filled in	# Check to see if enough information was filled in
for my $field ('title','author','subject','keywords','url','version',	for my $field ('title','author','subject','keywords','url','version',
'notes','abstract','mime','language','owner',	'notes','abstract','mime','language','owner',
Line 724 sub advancedsearch {	Line 791 sub advancedsearch {
}	}
unless ($fillflag) {	unless ($fillflag) {
&output_blank_field_error($r);	&output_blank_field_error($r);
return OK;	return ;
}	}
# Turn the form input into a SQL-based query	# Turn the form input into a SQL-based query
my $query='';	my $query='';
Line 734 sub advancedsearch {	Line 801 sub advancedsearch {
'keywords','version','owner','mime') {	'keywords','version','owner','mime') {
if ($ENV{'form.'.$field}) {	if ($ENV{'form.'.$field}) {
push @queries,&build_SQL_query($field,$ENV{'form.'.$field});	push @queries,&build_SQL_query($field,$ENV{'form.'.$field});
}	}
}	}
# Evaluate option lists	# Evaluate option lists
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {	if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') {
push @queries,"(language like \"$ENV{'form.language'}\")";	push @queries,"(language like \"$ENV{'form.language'}\")";
}	}
# if ($ENV{'form.mime'} and $ENV{'form.mime'} ne 'any') {
# push @queries,"(mime like \"$ENV{'form.mime'}\")";
# }
if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {	if ($ENV{'form.copyright'} and $ENV{'form.copyright'} ne 'any') {
push @queries,"(copyright like \"$ENV{'form.copyright'}\")";	push @queries,"(copyright like \"$ENV{'form.copyright'}\")";
}	}
Line 764 sub advancedsearch {	Line 828 sub advancedsearch {
# Test to see if date windows are legitimate	# Test to see if date windows are legitimate
if ($datequery=~/^Incorrect/) {	if ($datequery=~/^Incorrect/) {
&output_date_error($r,$datequery);	&output_date_error($r,$datequery);
return OK;	return ;
}	}
elsif ($datequery) {	elsif ($datequery) {
push @queries,$datequery;	push @queries,$datequery;
}	}
# Process form information for custom metadata querying	# Process form information for custom metadata querying
my $customquery='';	my $customquery=undef;
if ($ENV{'form.custommetadata'}) {	if ($ENV{'form.custommetadata'}) {
$customquery=&build_custommetadata_query('custommetadata',	$customquery=&build_custommetadata_query('custommetadata',
$ENV{'form.custommetadata'});	$ENV{'form.custommetadata'});
}	}
my $customshow='';	my $customshow=undef;
if ($ENV{'form.customshow'}) {	if ($ENV{'form.customshow'}) {
$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);
}	}
# Send query statements over the network to be processed by either the SQL	## ---------------------------------------------------------------
# database or a recursive scheme of 'grep'-like actions (for custom	## Deal with restrictions to given domains
# metadata).	##
	my $libraries_to_query = undef;
	# $ENV{'form.domains'} can be either a scalar or an array reference.
	# We need an array.
	my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}}
	: ($ENV{'form.domains'}) );
	my %domain_hash = ();
	foreach (@allowed_domains) {
	$domain_hash{$_}++;
	}
	foreach (keys(%Apache::lonnet::libserv)) {
	if ($_ eq 'any') {
	$libraries_to_query = undef;
	last;
	}
	if (exists($domain_hash{$Apache::lonnet::hostdom{$_}})) {
	push @$libraries_to_query,$_;
	}
	}
	#
if (@queries) {	if (@queries) {
$query=join(" AND ",@queries);	$query=join(" AND ",@queries);
$query="select * from metadata where $query";	$query="select * from metadata where $query";
my $reply; # reply hash reference
unless ($customquery or $customshow) {
$reply=&Apache::lonnet::metadata_query($query);
}
else {
$reply=&Apache::lonnet::metadata_query($query,
$customquery,$customshow);
}
&output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden);
return OK;
} elsif ($customquery) {	} elsif ($customquery) {
my $reply; # reply hash reference	$query = '';
$reply=&Apache::lonnet::metadata_query('',
$customquery,$customshow);
&output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden);
return OK;
}	}
# should not get to this point	return ($query,$customquery,$customshow,$libraries_to_query);
return 'Error. Should not have gone to this point.';
}	}

######################################################################	######################################################################
Line 814 sub advancedsearch {	Line 882 sub advancedsearch {

=pod	=pod

=item &basicsearch()	=item &parse_basic_search()

Parse basic search form.	Parse the basic search form and return a scalar containing an sql query.

=cut	=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub basicsearch {	sub parse_basic_search {
my ($r,$envhash,$hidden)=@_;	my ($r)=@_;
my %ENV=%{$envhash};
# Clean up fields for safety	# Clean up fields for safety
for my $field ('basicexp') {	for my $field ('basicexp') {
$ENV{"form.$field"}=~s/[^\w\s\-]//g;	$ENV{"form.$field"}=~s/[^\w\s\-]//g;
Line 850 sub basicsearch {	Line 917 sub basicsearch {
$concatarg='title' if $ENV{'form.titleonly'};	$concatarg='title' if $ENV{'form.titleonly'};

$query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'});	$query=&build_SQL_query('concat('.$concatarg.')',$ENV{'form.'.'basicexp'});
	return 'select * from metadata where '.$query;
# Get reply (either a hash reference to filehandles or bad connection)
# &Apache::lonnet::logthis("metadata query started:".time);
my $reply=&Apache::lonnet::metadata_query('select * from metadata where '.$query);
# &Apache::lonnet::logthis("metadata query finished:".time);
# Output search results

&output_results('Basic',$r,$envhash,$query,$reply,$hidden);

return OK;
}	}


Line 1049 contacted, etc.)	Line 1107 contacted, etc.)
sub output_results {	sub output_results {
# &Apache::lonnet::logthis("output_results:".time);	# &Apache::lonnet::logthis("output_results:".time);
my $fnum; # search result counter	my $fnum; # search result counter
my ($mode,$r,$envhash,$query,$replyref,$hidden)=@_;	my ($mode,$r,$replyref,$hidden)=@_;
my %ENV=%{$envhash};
my %rhash=%{$replyref};	my %rhash=%{$replyref};
my $compiledresult='';	my $compiledresult='';
my $timeremain=300; # (seconds)	my $timeremain=300; # (seconds)
my $elapsetime=0;	my $elapsetime=0;
my $resultflag=0;	my $resultflag=0;
my $tflag=1;	my $tflag=1;
	my $viewselect=$ENV{'form.viewselect'};
#	#
# make query information persistent to allow for subsequent revision	# make query information persistent to allow for subsequent revision
my $persistent=&make_persistent();	my $persistent=&make_persistent(\%ENV);
# spit out the generic header	# spit out the results header
$r->print(&search_results_header());	$r->print(&search_results_header($mode));
$r->rflush();	$r->rflush();
# begin showing the cataloged results	# begin showing the cataloged results
$r->print(<<CATALOGBEGIN);
</head>
<body bgcolor="#ffffff">
<img align=right src=/adm/lonIcons/lonlogos.gif>
<h1>Search Catalog</h1>
CATALOGBEGIN
my $action = "/adm/searchcat";	my $action = "/adm/searchcat";
if ($mode eq 'Basic') {	if ($mode eq 'Basic') {
$action .= "?reqinterface=basic";	$action .= "?reqinterface=basic";
Line 1086 $importbutton	Line 1138 $importbutton
$closebutton	$closebutton
$persistent	$persistent
<hr />	<hr />
<h3>Search Query</h3>
CATALOGCONTROLS	CATALOGCONTROLS
#	#
# Remind them what they searched for
#
if ($mode eq 'Basic') {
$r->print('<p><b>Basic search:</b> '.$ENV{'form.basicexp'}.'</p>');
} elsif ($mode eq 'Advanced') {
$r->print('<p><b>Advanced search</b> '.$query.'</p>');
}
$r->print('<h3>Search Results</h3>');
$r->rflush();
#
# make the pop-up window for status	# make the pop-up window for status
#	#
$r->print(&make_popwin(%rhash));	$r->print(&make_popwin(%rhash));
Line 1202 CATALOGCONTROLS	Line 1243 CATALOGCONTROLS
$Fields{'extrashow'}=~s/\<\!\-\- $field \-\-\>/ $value/g;	$Fields{'extrashow'}=~s/\<\!\-\- $field \-\-\>/ $value/g;
}	}
}	}
if ($compiledresult or $servercount!=$servernum) {
$compiledresult.="<hr align='left' width='200' noshade />";
}
$compiledresult.="\n<p>\n";	$compiledresult.="\n<p>\n";
if ($ENV{'form.catalogmode'} eq 'interactive') {	if ($ENV{'form.catalogmode'} eq 'interactive') {
my $titleesc=$Fields{'title'};	my $titleesc=$Fields{'title'};
Line 1231 END	Line 1269 END
# <input type="hidden" name="url$fnum" value="$url" />	# <input type="hidden" name="url$fnum" value="$url" />
$fnum++;	$fnum++;
}	}
my $viewselect;
if ($mode eq 'Basic') {
$viewselect=$ENV{'form.basicviewselect'};
}
elsif ($mode eq 'Advanced') {
$viewselect=$ENV{'form.advancedviewselect'};
}
if ($viewselect eq 'Detailed Citation View') {	if ($viewselect eq 'Detailed Citation View') {
$compiledresult.=&detailed_citation_view	$compiledresult.=&detailed_citation_view
(%Fields, hostname => $rkey );	(%Fields, hostname => $rkey );
Line 1254 END	Line 1285 END
$compiledresult.=&xml_sgml_view	$compiledresult.=&xml_sgml_view
(%Fields, hostname => $rkey );	(%Fields, hostname => $rkey );
}	}
	if ($compiledresult or $servercount!=$servernum) {
	$compiledresult.="<hr align='left' width='200' noshade />";
	}
}	}
untie %hash;	untie %hash;
}	}
Line 1332 sub parse_raw_result {	Line 1366 sub parse_raw_result {
&Apache::loncommon::copyrightdescription($Fields{'copyright'});	&Apache::loncommon::copyrightdescription($Fields{'copyright'});
$Fields{'mimetag'} =	$Fields{'mimetag'} =
&Apache::loncommon::filedescription($Fields{'mime'});	&Apache::loncommon::filedescription($Fields{'mime'});
	if ($Fields{'author'}=~/^(\s*\|error)$/) {
	$Fields{'author'}="Unknown Author";
	}
# Put spaces in the keyword list, if needed.	# Put spaces in the keyword list, if needed.
$Fields{'keywords'}=~ s/,([A-z])/, $1/g;	$Fields{'keywords'}=~ s/,([A-z])/, $1/g;
if ($Fields{'title'}=~ /^\s*$/ ) {	if ($Fields{'title'}=~ /^\s*$/ ) {
Line 1402 sub handle_custom_fields {	Line 1439 sub handle_custom_fields {

=item &search_results_header	=item &search_results_header

Output the proper javascript code to deal with different calling modes.	Output the proper html headers and javascript code to deal with different
	calling modes.

	Takes most inputs directly from %ENV, except $mode.

	=over 4

	=item $mode is either (at this writing) 'Basic' or 'Advanced'

Takes inputs directly from from %ENV. The following environment variables	=back
are checked:
	The following environment variables are checked:

=over 4	=over 4

Line 1428 Checked for existance & 'edit' mode.	Line 1473 Checked for existance & 'edit' mode.
######################################################################	######################################################################
######################################################################	######################################################################
sub search_results_header {	sub search_results_header {
	my ($mode) = @_;
	$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;	$result.=<<BEGINNING;
<html>	<html>
<head>	<head>
<title>The LearningOnline Network with CAPA</title>	<title>$title</title>
BEGINNING	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
Line 1516 SCRIPT	Line 1569 SCRIPT
}	}
</script>	</script>
SCRIPT	SCRIPT
	$result.=<<END;
	</head>
	<body bgcolor="#ffffff">
	<img align=right src=/adm/lonIcons/lonlogos.gif>
	<h1>$title</h1>
	END
return $result;	return $result;
}	}

Line 1639 extra custom metadata to show.	Line 1698 extra custom metadata to show.
sub detailed_citation_view {	sub detailed_citation_view {
my %values = @_;	my %values = @_;
my $result=<<END;	my $result=<<END;
<i>$values{'owner'}</i>, last revised $values{'lastrevisiondate'}
<h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"	<h3><a href="http://$ENV{'HTTP_HOST'}$values{'url'}"
target='search_preview'>$values{'title'}</a></h3>	target='search_preview'>$values{'title'}</a></h3>
<h3>$values{'author'}</h3>
</p>
<p>	<p>
<b>Subject:</b> $values{'subject'}<br />	<b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
<b>Keyword(s):</b> $values{'keywords'}<br />
<b>Notes:</b> $values{'notes'}<br />	<b>Subject: </b> $values{'subject'}<br />
<b>MIME Type:</b>	<b>Keyword(s): </b> $values{'keywords'}<br />
END	<b>Notes: </b> $values{'notes'}<br />
$result.=&Apache::loncommon::filedescription($values{'mime'});	<b>MIME Type: </b> $values{'mimetag'}<br />
$result.=<<END;	<b>Language: </b> $values{'language'}<br />
<br />	<b>Copyright/Distribution:</b> $values{'cprtag'}<br />
<b>Language:</b>
END
$result.=&Apache::loncommon::languagedescription($values{'lang'});
$result.=<<END;
<br />
<b>Copyright/Distribution:</b>
END
$result.=&Apache::loncommon::copyrightdescription($values{'copyright'});
$result.=<<END;
<br />
</p>	</p>
$values{'extrashow'}	$values{'extrashow'}
<p>	<p>
Line 1816 sub filled {	Line 1862 sub filled {
sub output_blank_field_error {	sub output_blank_field_error {
my ($r)=@_;	my ($r)=@_;
# make query information persistent to allow for subsequent revision	# make query information persistent to allow for subsequent revision
my $persistent=&make_persistent();	my $persistent=&make_persistent(\%ENV);

$r->print(<<BEGINNING);	$r->print(<<BEGINNING);
<html>	<html>
Line 1862 Output a full html page with an error me	Line 1908 Output a full html page with an error me
sub output_date_error {	sub output_date_error {
my ($r,$message)=@_;	my ($r,$message)=@_;
# make query information persistent to allow for subsequent revision	# make query information persistent to allow for subsequent revision
my $persistent=&make_persistent();	my $persistent=&make_persistent(\%ENV);

$r->print(<<RESULTS);	$r->print(<<RESULTS);
<html>	<html>

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

Removed from v.1.129
changed lines
	Added in v.1.134