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.195 and 1.199

version 1.195, 2003/12/16 15:00:56	version 1.199, 2003/12/28 20:12:59
Line 59 search (on a server basis) is displayed	Line 59 search (on a server basis) is displayed
###############################################################################	###############################################################################
###############################################################################	###############################################################################

###############################################################################
## ##
## ORGANIZATION OF THIS PERL MODULE ##
## ##
## 1. Modules used by this module ##
## 2. Variables used throughout the module ##
## 3. handler subroutine called via Apache and mod_perl ##
## 4. Other subroutines ##
## ##
###############################################################################

package Apache::lonsearchcat;	package Apache::lonsearchcat;

# ------------------------------------------------- modules used by this module
use strict;	use strict;
use Apache::Constants qw(:common :http);	use Apache::Constants qw(:common :http);
use Apache::lonnet();	use Apache::lonnet();
Line 84 use Apache::loncommon();	Line 72 use Apache::loncommon();
use Apache::lonmysql();	use Apache::lonmysql();
use Apache::lonlocal;	use Apache::lonlocal;

# ---------------------------------------- variables used throughout the module

######################################################################	######################################################################
######################################################################	######################################################################
	##
=pod	## Global variables
	##
=item Global variables

=over 4

=item $importbutton

button to take the select results and go to group sorting

=item %groupsearch_db

Database hash used to save values for the groupsearch RAT interface.

=item $diropendb

The full path to the (temporary) search database file. This is set and
used in &handler() and is also used in &output_results().

=item %Views

Hash which associates an output view description with the function
that produces it. Adding a new view type should be as easy as
adding a line to the definition of this hash and making sure the function
takes the proper parameters.

=item $bodytag

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

=back

=cut

######################################################################	######################################################################
######################################################################	######################################################################
	my %groupsearch_db; # Database hash used to save values for the
# -- dynamically rendered interface components	# groupsearch RAT interface.
my $importbutton; # button to take the selected results and go to group sorting	my %persistent_db; # gdbm hash which holds data which is supposed to
	# persist across calls to lonsearchcat.pm
# -- miscellaneous variables	## %Views:
my %groupsearch_db; # database hash	## Hash which associates an output view description with the function
my $diropendb = ""; # db file	## that produces it.
# View Description Function Pointer	# View Description/Name Function Pointer
my %Views = ("Detailed Citation View" => \&detailed_citation_view,	my %Views = ("Detailed Citation View" => \&detailed_citation_view,
"Summary View" => \&summary_view,	"Summary View" => \&summary_view,
"Fielded Format" => \&fielded_format_view,	"Fielded Format" => \&fielded_format_view,
"XML/SGML" => \&xml_sgml_view,	"XML/SGML" => \&xml_sgml_view,
"Compact View" => \&compact_view);	"Compact View" => \&compact_view);
my %persistent_db;
my $hidden_fields;
my $bodytag;

#
# For course search
#
my %alreadyseen;
my $hashtied;
my %hash;
my $totalfound;

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

=pod

=item &handler() - main handler invoked by httpd child

=item Variables

=over 4

=item $hidden

holds 'hidden' html forms

=item $scrout

string that holds portions of the screen output

=back

=cut

######################################################################	######################################################################
######################################################################	######################################################################
sub handler {	sub handler {
my $r = shift;	my $r = shift;
	# &set_defaults();
	#
	# set form defaults
#	#
	my $hidden_fields;# Hold all the hidden fields used to keep track
	# of the search system state
	my $importbutton; # button to take the selected results and go to group
	# sorting
	my $diropendb; # The full path to the (temporary) search database file.
	# This is set and used in &handler() and is also used in
	# &output_results().
	my $bodytag; # LON-CAPA standard body tag, gotten from
	# &Apache::lonnet::bodytag.
	# No title, no table, just a <body> tag.

my $loaderror=&Apache::lonnet::overloaderror($r);	my $loaderror=&Apache::lonnet::overloaderror($r);
if ($loaderror) { return $loaderror; }	if ($loaderror) { return $loaderror; }
Line 334 END	Line 267 END
## Switch on the phase	## Switch on the phase
##	##
if ($ENV{'form.phase'} eq 'disp_basic') {	if ($ENV{'form.phase'} eq 'disp_basic') {
&print_basic_search_form($r,$closebutton);	&print_basic_search_form($r,$closebutton,$hidden_fields);
} elsif ($ENV{'form.phase'} eq 'disp_adv') {	} elsif ($ENV{'form.phase'} eq 'disp_adv') {
&print_advanced_search_form($r,$closebutton);	&print_advanced_search_form($r,$closebutton,$hidden_fields);
} elsif ($ENV{'form.phase'} eq 'results') {	} elsif ($ENV{'form.phase'} eq 'results') {
&display_results($r,$importbutton,$closebutton);	&display_results($r,$importbutton,$closebutton,$diropendb);
} elsif ($ENV{'form.phase'} =~ /^(sort\|run_search)$/) {	} elsif ($ENV{'form.phase'} =~ /^(sort\|run_search)$/) {
my ($query,$customquery,$customshow,$libraries,$pretty_string) =	my ($query,$customquery,$customshow,$libraries,$pretty_string) =
&get_persistent_data($persistent_db_file,	&get_persistent_data($persistent_db_file,
Line 360 END	Line 293 END
}	}
# Set up table	# Set up table
if (! defined(&create_results_table())) {	if (! defined(&create_results_table())) {
	my $errorstring=&Apache::lonmysql::get_error();
$r->print(<<END);	$r->print(<<END);
<html><head><title>Search Error</title></head>	<html><head><title>Search Error</title></head>
$bodytag	$bodytag
Unable to create table in which to store search results.	Unable to create table in which to store search results.
The search has been aborted.	The search has been aborted.
	<br />$errorstring
</body>	</body>
</html>	</html>
END	END
Line 388 END	Line 323 END
my $pretty_string;	my $pretty_string;
if ($ENV{'form.phase'} eq 'basic_search') {	if ($ENV{'form.phase'} eq 'basic_search') {
($query,$pretty_string,$libraries) =	($query,$pretty_string,$libraries) =
&parse_basic_search($r,$closebutton);	&parse_basic_search($r,$closebutton,$hidden_fields);
} else { # Advanced 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,$hidden_fields);
return OK if (! defined($query));	return OK if (! defined($query));
}	}
&make_persistent({ query => $query,	&make_persistent({ query => $query,
Line 410 END	Line 345 END

######################################################################	######################################################################
######################################################################	######################################################################
	##
	## Course Search
	##
	######################################################################
	######################################################################
	{ # Scope the course search to avoid global variables
	#
	# Variables For course search
	my %alreadyseen;
	my %hash;
	my $totalfound;

sub course_search {	sub course_search {
my $r=shift;	my $r=shift;
Line 432 sub course_search {	Line 378 sub course_search {
$bodytag.$pretty_search_string);	$bodytag.$pretty_search_string);
$r->rflush();	$r->rflush();
# ======================================================= Go through the course	# ======================================================= Go through the course
$hashtied=0;	undef %alreadyseen;
undef %alreadyseen;	%alreadyseen=();
%alreadyseen=();
my $c=$r->connection;	my $c=$r->connection;
&tiehash();	if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
foreach (keys %hash) {	&GDBM_READER(),0640)) {
if ($c->aborted()) { last; }	foreach (keys %hash) {
if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {	if ($c->aborted()) { last; }
&checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,@allwords);	if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
}	&checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,
}	@allwords);
&untiehash();	}
	}
	untie(%hash);
	}
unless ($totalfound) {	unless ($totalfound) {
$r->print('<p>'.&mt('No resources found').'.</p>');	$r->print('<p>'.&mt('No resources found').'.</p>');
}	}
Line 451 sub course_search {	Line 399 sub course_search {
$r->print('</body></html>');	$r->print('</body></html>');
}	}

# ---------------------------------------------------------------- tie the hash

sub tiehash {
$hashtied=0;
if ($ENV{'request.course.fn'}) {
if (tie(%hash,'GDBM_File',$ENV{'request.course.fn'}.".db",
&GDBM_READER(),0640)) {
$hashtied=1;
}
}
}

sub untiehash {
if ($hashtied) { untie %hash; }
$hashtied=0;
}

# =============================== This pulls up a resource and its dependencies	# =============================== This pulls up a resource and its dependencies

sub checkonthis {	sub checkonthis {
Line 513 sub checkonthis {	Line 444 sub checkonthis {
}	}
}	}

	sub untiehash {
	if (tied(%hash)) {
	untie(%hash);
	}
	}

	} # End of course search scoping

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

Line 528 Returns a scalar which holds html for th	Line 467 Returns a scalar which holds html for th
######################################################################	######################################################################

sub print_basic_search_form{	sub print_basic_search_form{
my ($r,$closebutton) = @_;	my ($r,$closebutton,$hidden_fields) = @_;
my $bodytag=&Apache::loncommon::bodytag('Search');	my $bodytag=&Apache::loncommon::bodytag('Search');
my $scrout=<<"ENDDOCUMENT";	my $scrout=<<"ENDDOCUMENT";
<html>	<html>
Line 561 $Statement.	Line 500 $Statement.
ENDDOCUMENT	ENDDOCUMENT
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).	$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
' ';	' ';
my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});	my $relatedcheckbox = &simplecheckbox('related','related',$ENV{'form.related'});
my $domain = $r->dir_config('lonDefDomain');	my $domain = $r->dir_config('lonDefDomain');
my $domaincheckbox = &simplecheckbox('domains',$domain);	my $domaincheckbox = &simplecheckbox('domains',$domain);
my $srch=&mt('Search');	my $srch=&mt('Search');
Line 649 Returns a scalar which holds html for th	Line 588 Returns a scalar which holds html for th
######################################################################	######################################################################

sub print_advanced_search_form{	sub print_advanced_search_form{
my ($r,$closebutton) = @_;	my ($r,$closebutton,$hidden_fields) = @_;
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 709 ENDHEADER	Line 648 ENDHEADER
$ENV{'form.notes'});	$ENV{'form.notes'});
$scrout.=&searchphrasefield_with_related('abstract','abstract',	$scrout.=&searchphrasefield_with_related('abstract','abstract',
$ENV{'form.abstract'});	$ENV{'form.abstract'});
	$scrout.=&searchphrasefield('Standards','standards',$ENV{'form.standards'});
# Hack - an empty table row.	# Hack - an empty table row.
$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";	$scrout.="<tr><td> </td><td> </td><td> </td></tr>\n";
$scrout.=&searchphrasefield('file<br />extension','extension',	$scrout.=&searchphrasefield('file<br />extension','extension',
Line 1036 sub simpletextfield {	Line 976 sub simpletextfield {

=item &simplecheckbox()	=item &simplecheckbox()

Inputs: $name,$value	Inputs: $name,$value,$checked

Returns a simple check box with the given $name.	Returns a simple check box with the given $name.
If $value eq 'on' the box is checked.	If $value eq 'on' the box is checked.
Line 1048 If $value eq 'on' the box is checked.	Line 988 If $value eq 'on' the box is checked.

sub simplecheckbox{	sub simplecheckbox{
my ($name,$value,$checked)=@_;	my ($name,$value,$checked)=@_;
$checked="checked" if ($value eq 'on');	$checked="checked" if ($value eq $checked \|\| $value eq 'on');
return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '.	return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '.
$checked.' />';	$checked.' />';
}	}
Line 1301 Parse advanced search form and return th	Line 1241 Parse advanced search form and return th
######################################################################	######################################################################
######################################################################	######################################################################
sub parse_advanced_search {	sub parse_advanced_search {
my ($r,$closebutton)=@_;	my ($r,$closebutton,$hidden_fields)=@_;
my $fillflag=0;	my $fillflag=0;
my $pretty_search_string = "<br />\n";	my $pretty_search_string = "<br />\n";
# Clean up fields for safety	# Clean up fields for safety
Line 1335 sub parse_advanced_search {	Line 1275 sub parse_advanced_search {
}	}
}	}
unless ($fillflag) {	unless ($fillflag) {
&output_blank_field_error($r,$closebutton,'phase=disp_adv');	&output_blank_field_error($r,$closebutton,'phase=disp_adv',$hidden_fields);
return ;	return ;
}	}
# Turn the form input into a SQL-based query	# Turn the form input into a SQL-based query
Line 1418 sub parse_advanced_search {	Line 1358 sub parse_advanced_search {
);	);
# 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,$closebutton);	&output_date_error($r,$datequery,$closebutton,$hidden_fields);
return ;	return ;
} elsif ($datequery) {	} elsif ($datequery) {
# Here is where you would set up pretty_search_string to output	# Here is where you would set up pretty_search_string to output
Line 1853 sub ensure_db_and_table {	Line 1793 sub ensure_db_and_table {
######################################################################	######################################################################
sub print_sort_form {	sub print_sort_form {
my ($r,$pretty_query_string) = @_;	my ($r,$pretty_query_string) = @_;
	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
##	##
my %SortableFields=&Apache::lonlocal::texthash(	my %SortableFields=&Apache::lonlocal::texthash(
id => 'Default',	id => 'Default',
Line 1961 my @Datatypes =	Line 1902 my @Datatypes =
{ name => 'notes', type=>'TEXT'},	{ name => 'notes', type=>'TEXT'},
{ name => 'abstract', type=>'TEXT'},	{ name => 'abstract', type=>'TEXT'},
{ name => 'mime', type=>'TEXT'},	{ name => 'mime', type=>'TEXT'},
{ name => 'lang', type=>'TEXT'},	{ name => 'language', type=>'TEXT'},
{ name => 'owner', type=>'TEXT'},	{ name => 'owner', type=>'TEXT'},
{ name => 'copyright', type=>'TEXT'},	{ name => 'copyright', type=>'TEXT'},
{ name => 'hostname', type=>'TEXT'},	{ name => 'dependencies', type=>'TEXT'},
	{ name => 'modifyinguser', type=>'TEXT'},
	{ name => 'authorspace', type=>'TEXT'},
	{ name => 'lowestgradelevel', type=>'INT'},
	{ name => 'highestgradelevel', type=>'INT'},
	{ name => 'standards', type=>'TEXT'},
	{ name => 'count', type=>'INT'},
	{ name => 'course', type=>'INT'},
	{ name => 'course_list', type=>'TEXT'},
	{ name => 'goto', type=>'INT'},
	{ name => 'goto_list', type=>'TEXT'},
	{ name => 'comefrom', type=>'INT'},
	{ name => 'comefrom_list', type=>'TEXT'},
	{ name => 'sequsage', type=>'INT'},
	{ name => 'sequsage_list', type=>'TEXT'},
	{ name => 'stdno', type=>'INT'},
	{ name => 'stdno_list', type=>'TEXT'},
	{ name => 'avetries', type=>'FLOAT'},
	{ name => 'avetries_list', type=>'TEXT'},
	{ name => 'difficulty', type=>'FLOAT'},
	{ name => 'difficulty_list', type=>'TEXT'},
	{ name => 'clear', type=>'FLOAT'},
	{ name => 'technical', type=>'FLOAT'},
	{ name => 'correct', type=>'FLOAT'},
	{ name => 'helpful', type=>'FLOAT'},
	{ name => 'depth', type=>'FLOAT'},
	{ name => 'hostname', type=> 'TEXT'},
#--------------------------------------------------	#--------------------------------------------------
{ name => 'creationdate', type=>'DATETIME'},	{ name => 'creationdate', type=>'DATETIME'},
{ name => 'lastrevisiondate', type=>'DATETIME'},	{ name => 'lastrevisiondate', type=>'DATETIME'},
Line 2098 sub revise_button {	Line 2065 sub revise_button {
######################################################################	######################################################################
sub run_search {	sub run_search {
my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;	my ($r,$query,$customquery,$customshow,$serverlist,$pretty_string) = @_;
	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
my $connection = $r->connection;	my $connection = $r->connection;
#	#
# Timing variables	# Timing variables
Line 2348 sub prev_next_buttons {	Line 2316 sub prev_next_buttons {
######################################################################	######################################################################
######################################################################	######################################################################
sub display_results {	sub display_results {
my ($r,$importbutton,$closebutton) = @_;	my ($r,$importbutton,$closebutton,$diropendb) = @_;
my $connection = $r->connection;	my $connection = $r->connection;
$r->print(&search_results_header($importbutton,$closebutton));	$r->print(&search_results_header($importbutton,$closebutton));
##	##
Line 2528 sub parse_row {	Line 2496 sub parse_row {
$Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);	$Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
}	}
$Fields{'language'} =	$Fields{'language'} =
&Apache::loncommon::languagedescription($Fields{'lang'});	&Apache::loncommon::languagedescription($Fields{'language'});
$Fields{'copyrighttag'} =	$Fields{'copyrighttag'} =
&Apache::loncommon::copyrightdescription($Fields{'copyright'});	&Apache::loncommon::copyrightdescription($Fields{'copyright'});
$Fields{'mimetag'} =	$Fields{'mimetag'} =
Line 2544 sub parse_row {	Line 2512 sub parse_row {
=item &parse_raw_result()	=item &parse_raw_result()

Takes a line from the file of results and parse it. Returns a hash	Takes a line from the file of results and parse it. Returns a hash
with keys for the following fields:	with keys according to column labels
'title', 'author', 'subject', 'url', 'keywords', 'version', 'notes',
'abstract', 'mime', 'lang', 'owner', 'copyright', 'creationdate',
'lastrevisiondate'.

In addition, the following tags are set by calling the appropriate	In addition, the following tags are set by calling the appropriate
lonnet function: 'language', 'cprtag', 'mimetag'.	lonnet function: 'language', 'copyrighttag', 'mimetag'.

The 'title' field is set to "Untitled" if the title field is blank.	The 'title' field is set to "Untitled" if the title field is blank.

Line 2565 sub parse_raw_result {	Line 2530 sub parse_raw_result {
# Check for a comma - if it is there then we do not need to unescape the	# Check for a comma - if it is there then we do not need to unescape the
# string. There seems to be some kind of problem with some items in	# string. There seems to be some kind of problem with some items in
# the database - the entire string gets sent out unescaped...?	# the database - the entire string gets sent out unescaped...?
unless ($result =~ /,/) {	# unless ($result =~ /,/) {
$result = &Apache::lonnet::unescape($result);	# $result = &Apache::lonnet::unescape($result);
}	# }
my @fields=map {	# conclude from self to others regarding fields
&Apache::lonnet::unescape($_);	my %Fields=&Apache::lonmeta::metadata_col_to_hash(
} (split(/\,/,$result));	map {
my ($title,$author,$subject,$url,$keywords,$version,	&Apache::lonnet::unescape($_);
$notes,$abstract,$mime,$lang,	} (split(/\,/,$result))
$creationdate,$lastrevisiondate,$owner,$copyright)=@fields;	);
my %Fields =	# prettier display
( title => &Apache::lonnet::unescape($title),
author => &Apache::lonnet::unescape($author),
subject => &Apache::lonnet::unescape($subject),
url => &Apache::lonnet::unescape($url),
keywords => &Apache::lonnet::unescape($keywords),
version => &Apache::lonnet::unescape($version),
notes => &Apache::lonnet::unescape($notes),
abstract => &Apache::lonnet::unescape($abstract),
mime => &Apache::lonnet::unescape($mime),
lang => &Apache::lonnet::unescape($lang),
owner => &Apache::lonnet::unescape($owner),
copyright => &Apache::lonnet::unescape($copyright),
creationdate => &Apache::lonnet::unescape($creationdate),
lastrevisiondate => &Apache::lonnet::unescape($lastrevisiondate)
);
$Fields{'language'} =	$Fields{'language'} =
&Apache::loncommon::languagedescription($Fields{'lang'});	&Apache::loncommon::languagedescription($Fields{'language'});
$Fields{'copyrighttag'} =	$Fields{'copyrighttag'} =
&Apache::loncommon::copyrightdescription($Fields{'copyright'});	&Apache::loncommon::copyrightdescription($Fields{'copyright'});
$Fields{'mimetag'} =	$Fields{'mimetag'} =
Line 2605 sub parse_raw_result {	Line 2555 sub parse_raw_result {
$Fields{'title'}='Untitled';	$Fields{'title'}='Untitled';
}	}
unless ($ENV{'user.adv'}) {	unless ($ENV{'user.adv'}) {
# What is this anyway?	# do not show descriptive information to non-advanced users
$Fields{'keywords'} = '- not displayed -';	$Fields{'keywords'} = '- not displayed -';
$Fields{'notes'} = '- not displayed -';	$Fields{'notes'} = '- not displayed -';
$Fields{'abstract'} = '- not displayed -';	$Fields{'abstract'} = '- not displayed -';
Line 2713 the name of the input field to put the t	Line 2663 the name of the input field to put the t
######################################################################	######################################################################
sub search_results_header {	sub search_results_header {
my ($importbutton,$closebutton) = @_;	my ($importbutton,$closebutton) = @_;
	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
my $result = '';	my $result = '';
# output beginning of search page	# output beginning of search page
# conditional output of script functions dependent on the mode in	# conditional output of script functions dependent on the mode in
Line 2816 END	Line 2767 END
######################################################################	######################################################################
######################################################################	######################################################################
sub search_status_header {	sub search_status_header {
	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
return <<ENDSTATUS;	return <<ENDSTATUS;
<html><head><title>Search Status</title></head>	<html><head><title>Search Status</title></head>
$bodytag	$bodytag
Line 2895 sub detailed_citation_view {	Line 2847 sub detailed_citation_view {
<b>Notes: </b> $values{'notes'}<br />	<b>Notes: </b> $values{'notes'}<br />
<b>MIME Type: </b> $values{'mimetag'}<br />	<b>MIME Type: </b> $values{'mimetag'}<br />
<b>Language: </b> $values{'language'}<br />	<b>Language: </b> $values{'language'}<br />
<b>Copyright/Distribution:</b> $values{'cprtag'}<br />	<b>Copyright/Distribution:</b> $values{'copyrighttag'}<br />
</p>	</p>
$values{'extrashow'}	$values{'extrashow'}
<p>	<p>
Line 3024 $prefix	Line 2976 $prefix
<mimetag>$values{'mimetag'}</mimetag>	<mimetag>$values{'mimetag'}</mimetag>
</mimeInfo>	</mimeInfo>
<languageInfo>	<languageInfo>
<language>$values{'lang'}</language>	<language>$values{'language'}</language>
<languagetag>$values{'language'}</languagetag>	<languagetag>$values{'languagetag'}</languagetag>
</languageInfo>	</languageInfo>
<creationdate>$values{'creationdate'}</creationdate>	<creationdate>$values{'creationdate'}</creationdate>
<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate>	<lastrevisiondate>$values{'lastrevisiondate'}</lastrevisiondate>
Line 3086 $parms is extra information to include i	Line 3038 $parms is extra information to include i
######################################################################	######################################################################
######################################################################	######################################################################
sub output_blank_field_error {	sub output_blank_field_error {
my ($r,$closebutton,$parms)=@_;	my ($r,$closebutton,$parms,$hidden_fields)=@_;
	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
# 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 3135 Inputs:	Line 3088 Inputs:
######################################################################	######################################################################
######################################################################	######################################################################
sub output_date_error {	sub output_date_error {
my ($r,$message,$closebutton)=@_;	my ($r,$message,$closebutton,$hidden_fields)=@_;
# make query information persistent to allow for subsequent revision	# make query information persistent to allow for subsequent revision
	my $bodytag=&Apache::loncommon::bodytag(undef,undef,undef,1);
$r->print(<<RESULTS);	$r->print(<<RESULTS);
<html>	<html>
<head>	<head>

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

Removed from v.1.195
changed lines
	Added in v.1.199