version 1.57, 2001/03/21 03:15:46
|
version 1.83, 2001/03/27 13:35:35
|
Line 94 sub handler {
|
Line 94 sub handler {
|
END |
END |
|
|
$closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive'; |
$closebutton=<<END if $ENV{'form.catalogmode'} eq 'interactive'; |
<input type="button" name="close" value="CLOSE" onClick="self.close()"> |
<input type="button" name="close" value='CLOSE' onClick="self.close()"> |
END |
END |
|
|
# ------------------------------------------------ First, check out environment |
# ------------------------------------------------ First, check out environment |
Line 229 LASTREVISIONDATEEND
|
Line 229 LASTREVISIONDATEEND
|
# ------------------------------------------- Compute customized metadata field |
# ------------------------------------------- Compute customized metadata field |
$scrout.=<<CUSTOMMETADATA; |
$scrout.=<<CUSTOMMETADATA; |
<p> |
<p> |
<font color="#800000" face="helvetica"><b>LIMIT BY OTHER METADATA FIELDS:</b> |
<font color="#800000" face="helvetica"><b>LIMIT BY SPECIAL METADATA FIELDS:</b> |
</font> |
</font> |
For author-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.<br> |
<i>key</i>=<i>value</i> separated by operators such as AND or OR.<br> |
<b>Example:</b> grandmother=75 OR grandfather=85 |
<b>Example:</b> grandmother=75 OR grandfather=85 |
<br> |
<br> |
Line 239 CUSTOMMETADATA
|
Line 239 CUSTOMMETADATA
|
$scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'}); |
$scrout.=&simpletextfield('custommetadata',$ENV{'form.custommetadata'}); |
$scrout.=' <i>initial users of this system do not need to worry about this option</i>'; |
$scrout.=' <i>initial users of this system do not need to worry about this option</i>'; |
|
|
|
$scrout.=<<CUSTOMSHOW; |
|
<p> |
|
<font color="#800000" face="helvetica"><b>SHOW SPECIAL METADATA FIELDS:</b> |
|
</font> |
|
Enter in a space-separated list of special metadata fields to show |
|
in a fielded listing for each record result. |
|
<br> |
|
CUSTOMSHOW |
|
$scrout.=&simpletextfield('customshow',$ENV{'form.customshow'}); |
|
$scrout.=' <i>initial users of this system do not need to worry about this option</i>'; |
|
|
# ---------------------------------------------------------------- Print screen |
# ---------------------------------------------------------------- Print screen |
$r->print(<<ENDDOCUMENT); |
$r->print(<<ENDDOCUMENT); |
<html> |
<html> |
Line 267 ENDDOCUMENT
|
Line 278 ENDDOCUMENT
|
$r->print(<<ENDDOCUMENT); |
$r->print(<<ENDDOCUMENT); |
<font color="#800000">Search historic archives</font> |
<font color="#800000">Search historic archives</font> |
<br> |
<br> |
<input type="submit" name="basicsubmit" value="SEARCH"> |
<input type="submit" name="basicsubmit" value='SEARCH' /> |
<input type="reset" name="reset" value="RESET"> |
<input type="reset" name="reset" value='RESET' /> |
$closebutton |
$closebutton |
$basicviewselect |
$basicviewselect |
</p> |
</p> |
Line 276 $basicviewselect
|
Line 287 $basicviewselect
|
<h3>Advanced Search</h3> |
<h3>Advanced Search</h3> |
$scrout |
$scrout |
<p> |
<p> |
<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 |
$advancedviewselect |
$advancedviewselect |
</p> |
</p> |
Line 292 ENDDOCUMENT
|
Line 303 ENDDOCUMENT
|
|
|
sub simpletextfield { |
sub simpletextfield { |
my ($name,$value)=@_; |
my ($name,$value)=@_; |
return '<input type=text name="'.$name.'" size=20 value="'.$value.'">'; |
return '<input type=text name=\''.$name. |
|
'\' size=20 value=\''.$value.'\' />'; |
} |
} |
|
|
sub simplecheckbox { |
sub simplecheckbox { |
my ($name,$value)=@_; |
my ($name,$value)=@_; |
my $checked=''; |
my $checked=''; |
$checked="CHECKED" if $value eq 'on'; |
$checked="CHECKED" if $value eq 'on'; |
return '<input type=checkbox name="'.$name.'" '. $checked . '>'; |
return '<input type=checkbox name=\''.$name.'\' '. $checked . '>'; |
} |
} |
|
|
sub searchphrasefield { |
sub searchphrasefield { |
Line 311 END
|
Line 323 END
|
my $uctitle=uc($title); |
my $uctitle=uc($title); |
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:</b>". |
return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:</b>". |
"</FONT> $instruction<br>". |
"</FONT> $instruction<br>". |
'<input type=text name="'.$name.'" size=80 value="'.$value.'">'; |
'<input type=text name="'.$name.'" size=80 value=\''.$value.'\'>'; |
} |
} |
|
|
sub dateboxes { |
sub dateboxes { |
Line 464 sub selectbox {
|
Line 476 sub selectbox {
|
my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:". |
"</b></font><br>".'<select name="'.$name.'">'; |
"</b></font><br>".'<select name="'.$name.'">'; |
map { |
map { |
$selout.='<option value="'.$_.'"'; |
$selout.='<option value=\''.$_.'\''; |
if ($_ eq $value) { $selout.=' selected'; } |
if ($_ eq $value) { $selout.=' selected'; } |
$selout.='>'.$options{$_}.'</option>'; |
$selout.='>'.$options{$_}.'</option>'; |
} sort keys %options; |
} sort keys %options; |
Line 477 sub advancedsearch {
|
Line 489 sub advancedsearch {
|
my %ENV=%{$envhash}; |
my %ENV=%{$envhash}; |
|
|
my $fillflag=0; |
my $fillflag=0; |
|
# Clean up fields for safety |
|
for my $field ('title','author','subject','keywords','url','version', |
|
'creationdatestart_month','creationdatestart_day', |
|
'creationdatestart_year','creationdateend_month', |
|
'creationdateend_day','creationdateend_year', |
|
'lastrevisiondatestart_month','lastrevisiondatestart_day', |
|
'lastrevisiondatestart_year','lastrevisiondateend_month', |
|
'lastrevisiondateend_day','lastrevisiondateend_year', |
|
'notes','abstract','mime','language','owner', |
|
'custommetadata','customshow') { |
|
$ENV{"form.$field"}=~s/[^\w\s\(\)\=\-\"\']//g; |
|
} |
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', |
'custommetadata') { |
'custommetadata') { |
Line 494 sub advancedsearch {
|
Line 518 sub advancedsearch {
|
|
|
my @queries; |
my @queries; |
# Go through logical expression AND/OR/NOT phrase fields. |
# Go through logical expression AND/OR/NOT phrase fields. |
foreach my $field ('title','author','subject','notes','abstract') { |
|
|
foreach my $field ('title','author','subject','notes','abstract','url', |
|
'keywords','version','owner') { |
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}); |
} |
} |
} |
} |
|
if ($ENV{'form.language'} and $ENV{'form.language'} ne 'any') { |
|
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') { |
|
push @queries,"(copyright like \"\%$ENV{'form.copyright'}\%\")"; |
|
} |
|
my $datequery=&build_date_queries( |
|
$ENV{'form.creationdatestart_month'}, |
|
$ENV{'form.creationdatestart_day'}, |
|
$ENV{'form.creationdatestart_year'}, |
|
$ENV{'form.creationdateend_month'}, |
|
$ENV{'form.creationdateend_day'}, |
|
$ENV{'form.creationdateend_year'}, |
|
$ENV{'form.lastrevisiondatestart_month'}, |
|
$ENV{'form.lastrevisiondatestart_day'}, |
|
$ENV{'form.lastrevisiondatestart_year'}, |
|
$ENV{'form.lastrevisiondateend_month'}, |
|
$ENV{'form.lastrevisiondateend_day'}, |
|
$ENV{'form.lastrevisiondateend_year'}, |
|
); |
|
if ($datequery=~/^Incorrect/) { |
|
&output_date_error($r,$datequery); |
|
return OK; |
|
} |
|
elsif ($datequery) { |
|
push @queries,$datequery; |
|
} |
|
my $customquery=''; |
|
if ($ENV{'form.custommetadata'}) { |
|
$customquery=&build_custommetadata_query('custommetadata', |
|
$ENV{'form.custommetadata'}); |
|
} |
|
my $customshow=''; |
|
if ($ENV{'form.customshow'}) { |
|
$customshow=$ENV{'form.customshow'}; |
|
$customshow=~s/[^\w\s]//g; |
|
my @fields=split(/\s+/,$customshow); |
|
$customshow=join(" ",@fields); |
|
} |
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=&Apache::lonnet::metadata_query($query); |
my $reply=''; |
&output_results('Advanced',$r,$envhash,$query,$reply); |
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); |
} |
} |
else { |
else { |
&output_results('Advanced',$r,$envhash,$query); |
&output_results('Advanced',$r,$envhash,$query); |
Line 527 sub basicsearch {
|
Line 602 sub basicsearch {
|
my ($r,$envhash)=@_; |
my ($r,$envhash)=@_; |
my %ENV=%{$envhash}; |
my %ENV=%{$envhash}; |
|
|
|
# Clean up fields for safety |
|
for my $field ('basicexp') { |
|
$ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g; |
|
} |
|
|
unless (&filled($ENV{'form.basicexp'})) { |
unless (&filled($ENV{'form.basicexp'})) { |
&output_blank_field_error($r); |
&output_blank_field_error($r); |
return OK; |
return OK; |
Line 546 sub basicsearch {
|
Line 626 sub basicsearch {
|
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=''; |
my $persistent=&make_persistent(); |
map { |
|
if (/^form\./ && !/submit/) { |
|
my $name=$_; |
|
my $key=$name; |
|
$name=~s/^form\.//; |
|
$persistent.=<<END; |
|
<INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'> |
|
END |
|
} |
|
} (keys %ENV); |
|
|
|
$r->print(<<BEGINNING); |
$r->print(<<BEGINNING); |
<html> |
<html> |
Line 614 sub output_results {
|
Line 684 sub output_results {
|
@results=<$fh>; |
@results=<$fh>; |
} |
} |
|
|
|
my $customshow=''; |
|
my $extrashow=''; |
|
if ($ENV{'form.customshow'}) { |
|
$customshow=$ENV{'form.customshow'}; |
|
$customshow=~s/[^\w\s]//g; |
|
my @fields=map {"<font color=\"#008000\">$_:</font>"} |
|
split(/\s+/,$customshow); |
|
if ($customshow) { |
|
$extrashow="<ul><li>".join("</li><li>",@fields)."</li></ul>\n"; |
|
} |
|
} |
|
my $customdata=''; |
foreach my $result (@results) { |
foreach my $result (@results) { |
|
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata |
|
$customdata.=$result; |
|
} |
|
} |
|
foreach my $result (@results) { |
|
next if $result=~/^custom\=/; |
|
chomp $result; |
my @fields=map |
my @fields=map |
{&Apache::lonnet::unescape($_)} |
{&Apache::lonnet::unescape($_)} |
(split(/\,/,$result)); |
(split(/\,/,$result)); |
Line 645 END
|
Line 734 END
|
|
|
if ($viewselect eq 'Detailed Citation View') { |
if ($viewselect eq 'Detailed Citation View') { |
$compiledresult.=&detailed_citation_view(@fields, |
$compiledresult.=&detailed_citation_view(@fields, |
$hostname,$httphost); |
$hostname,$httphost, |
|
$extrashow); |
} |
} |
elsif ($viewselect eq 'Summary View') { |
elsif ($viewselect eq 'Summary View') { |
$compiledresult.=&summary_view(@fields,$hostname,$httphost); |
$compiledresult.=&summary_view(@fields,$hostname,$httphost, |
|
$extrashow); |
} |
} |
elsif ($viewselect eq 'Fielded Format') { |
elsif ($viewselect eq 'Fielded Format') { |
$compiledresult.=&fielded_format_view(@fields,$hostname, |
$compiledresult.=&fielded_format_view(@fields,$hostname, |
$httphost); |
$httphost,$extrashow); |
} |
} |
elsif ($viewselect eq 'XML/SGML') { |
elsif ($viewselect eq 'XML/SGML') { |
$compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost); |
$compiledresult.=&xml_sgml_view(@fields,$hostname,$httphost, |
|
$extrashow); |
} |
} |
|
|
} |
} |
Line 665 END
|
Line 757 END
|
} |
} |
|
|
# make query information persistent to allow for subsequent revision |
# make query information persistent to allow for subsequent revision |
my $persistent=''; |
my $persistent=&make_persistent(); |
map { |
|
if (/^form\./ && !/submit/) { |
|
my $name=$_; |
|
my $key=$name; |
|
$name=~s/^form\.//; |
|
$persistent.=<<END; |
|
<INPUT TYPE='hidden' NAME='$name' VALUE='$ENV{$key}'> |
|
END |
|
} |
|
} (keys %ENV); |
|
|
|
$r->print(<<BEGINNING); |
$r->print(<<BEGINNING); |
<html> |
<html> |
Line 706 SCRIPT
|
Line 788 SCRIPT
|
<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"> |
|
$customdata |
<input type='button' value='Revise search request' |
<input type='button' value='Revise search request' |
onClick='this.form.submit();'> |
onClick='this.form.submit();'> |
$closebutton |
$closebutton |
Line 749 sub build_SQL_query {
|
Line 832 sub build_SQL_query {
|
return $sql_query; |
return $sql_query; |
} |
} |
|
|
|
# ------------------------------------------------- build custom metadata query |
|
sub build_custommetadata_query { |
|
my ($field_name,$logic_statement)=@_; |
|
my $q=new Text::Query('abc', |
|
-parse => 'Text::Query::ParseAdvanced', |
|
-build => 'Text::Query::BuildAdvancedString'); |
|
$q->prepare($logic_statement); |
|
my $matchexp=${$q}{'-parse'}{'-build'}{'matchstring'}; |
|
# quick fix to change literal into xml tag-matching |
|
# will eventually have to write a separate builder module |
|
my $oldmatchexp=$matchexp; |
|
$matchexp=~s/(\w+)\\\=(\w+)/\\\<$1\\\>\[\^\\\<\]\*$2\[\^\\\<\]\*\\\<\\\/$1\\\>/g; |
|
return $matchexp; |
|
} |
|
|
# - Recursively parse a reverse notation expression into a SQL query expression |
# - Recursively parse a reverse notation expression into a SQL query expression |
sub recursive_SQL_query_build { |
sub recursive_SQL_query_build { |
my ($dkey,$pattern)=@_; |
my ($dkey,$pattern)=@_; |
Line 783 sub detailed_citation_view {
|
Line 881 sub detailed_citation_view {
|
my ($title,$author,$subject,$url,$keywords,$version, |
my ($title,$author,$subject,$url,$keywords,$version, |
$notes,$shortabstract,$mime,$lang, |
$notes,$shortabstract,$mime,$lang, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$hostname,$httphost)=@_; |
$hostname,$httphost,$extrashow)=@_; |
my $result=<<END; |
my $result=<<END; |
<i>$owner</i>, last revised $lastrevisiondate |
<i>$owner</i>, last revised $lastrevisiondate |
<h3><A HREF="http://$httphost$url" TARGET='search_preview'>$title</A></h3> |
<h3><A HREF="http://$httphost$url" TARGET='search_preview'>$title</A></h3> |
Line 796 sub detailed_citation_view {
|
Line 894 sub detailed_citation_view {
|
<b>MIME Type:</b> $mimetag{$mime}<br> |
<b>MIME Type:</b> $mimetag{$mime}<br> |
<b>Language:</b> $language{$lang}<br> |
<b>Language:</b> $language{$lang}<br> |
<b>Copyright/Distribution:</b> $cprtag{$copyright}<br> |
<b>Copyright/Distribution:</b> $cprtag{$copyright}<br> |
|
</p> |
|
$extrashow |
|
<p> |
$shortabstract |
$shortabstract |
</p> |
</p> |
END |
END |
Line 807 sub summary_view {
|
Line 908 sub summary_view {
|
my ($title,$author,$subject,$url,$keywords,$version, |
my ($title,$author,$subject,$url,$keywords,$version, |
$notes,$shortabstract,$mime,$lang, |
$notes,$shortabstract,$mime,$lang, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$hostname,$httphost)=@_; |
$hostname,$httphost,$extrashow)=@_; |
my $result=<<END; |
my $result=<<END; |
<a href="http://$httphost$url" TARGET='search_preview'>$author</a><br /> |
<a href="http://$httphost$url" TARGET='search_preview'>$author</a><br /> |
$title<br /> |
$title<br /> |
$owner -- $lastrevisiondate<br /> |
$owner -- $lastrevisiondate<br /> |
$cprtag{$copyright}<br /> |
$cprtag{$copyright}<br /> |
|
$extrashow |
</p> |
</p> |
END |
END |
return $result; |
return $result; |
Line 823 sub fielded_format_view {
|
Line 925 sub fielded_format_view {
|
my ($title,$author,$subject,$url,$keywords,$version, |
my ($title,$author,$subject,$url,$keywords,$version, |
$notes,$shortabstract,$mime,$lang, |
$notes,$shortabstract,$mime,$lang, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$hostname,$httphost)=@_; |
$hostname,$httphost,$extrashow)=@_; |
my $result=<<END; |
my $result=<<END; |
<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A> |
<b>URL: </b> <A HREF="http://$httphost$url" TARGET='search_preview'>$url</A> |
<br /> |
<br /> |
Line 840 sub fielded_format_view {
|
Line 942 sub fielded_format_view {
|
<b>Copyright/Distribution:</b> $cprtag{$copyright}<br /> |
<b>Copyright/Distribution:</b> $cprtag{$copyright}<br /> |
<b>Repository Location:</b> $hostname<br /> |
<b>Repository Location:</b> $hostname<br /> |
<b>Abstract:</b> $shortabstract<br /> |
<b>Abstract:</b> $shortabstract<br /> |
|
$extrashow |
</p> |
</p> |
END |
END |
return $result; |
return $result; |
Line 850 sub xml_sgml_view {
|
Line 953 sub xml_sgml_view {
|
my ($title,$author,$subject,$url,$keywords,$version, |
my ($title,$author,$subject,$url,$keywords,$version, |
$notes,$shortabstract,$mime,$lang, |
$notes,$shortabstract,$mime,$lang, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$creationdate,$lastrevisiondate,$owner,$copyright, |
$hostname,$httphost)=@_; |
$hostname,$httphost,$extrashow)=@_; |
my $result=<<END; |
my $result=<<END; |
<pre> |
<pre> |
<LonCapaResource> |
<LonCapaResource> |
Line 879 sub xml_sgml_view {
|
Line 982 sub xml_sgml_view {
|
<shortabstract>$shortabstract</shortabstract> |
<shortabstract>$shortabstract</shortabstract> |
</LonCapaResource> |
</LonCapaResource> |
</pre> |
</pre> |
|
$extrashow |
END |
END |
return $result; |
return $result; |
} |
} |
|
|
|
sub build_date_queries { |
|
my ($cmonth1,$cday1,$cyear1,$cmonth2,$cday2,$cyear2, |
|
$lmonth1,$lday1,$lyear1,$lmonth2,$lday2,$lyear2)=@_; |
|
my @queries; |
|
if ($cmonth1 or $cday1 or $cyear1 or $cmonth2 or $cday2 or $cyear2) { |
|
unless ($cmonth1 and $cday1 and $cyear1 and |
|
$cmonth2 and $cday2 and $cyear2) { |
|
return "Incorrect entry for the creation date. You must specify ". |
|
"a starting month, day, and year and an ending month, ". |
|
"day, and year."; |
|
} |
|
my $cnumeric1=sprintf("%d%2d%2d",$cyear1,$cmonth1,$cday1); |
|
$cnumeric1+=0; |
|
my $cnumeric2=sprintf("%d%2d%2d",$cyear2,$cmonth2,$cday2); |
|
$cnumeric2+=0; |
|
if ($cnumeric1>$cnumeric2) { |
|
return "Incorrect entry for the creation date. The starting ". |
|
"date must occur before the ending date."; |
|
} |
|
my $cquery="(creationdate BETWEEN '$cyear1-$cmonth1-$cday1' AND '". |
|
"$cyear2-$cmonth2-$cday2 23:59:59')"; |
|
push @queries,$cquery; |
|
} |
|
if ($lmonth1 or $lday1 or $lyear1 or $lmonth2 or $lday2 or $lyear2) { |
|
unless ($lmonth1 and $lday1 and $lyear1 and |
|
$lmonth2 and $lday2 and $lyear2) { |
|
return "Incorrect entry for the last revision date. You must ". |
|
"specify a starting month, day, and year and an ending ". |
|
"month, day, and year."; |
|
} |
|
my $lnumeric1=sprintf("%d%2d%2d",$lyear1,$lmonth1,$lday1); |
|
$lnumeric1+=0; |
|
my $lnumeric2=sprintf("%d%2d%2d",$lyear2,$lmonth2,$lday2); |
|
$lnumeric2+=0; |
|
if ($lnumeric1>$lnumeric2) { |
|
return "Incorrect entry for the last revision date. The ". |
|
"starting date must occur before the ending date."; |
|
} |
|
my $lquery="(lastrevisiondate BETWEEN '$lyear1-$lmonth1-$lday1' AND '". |
|
"$lyear2-$lmonth2-$lday2 23:59:59')"; |
|
push @queries,$lquery; |
|
} |
|
if (@queries) { |
|
return join(" AND ",@queries); |
|
} |
|
return ''; |
|
} |
|
|
|
sub output_date_error { |
|
my ($r,$message)=@_; |
|
# make query information persistent to allow for subsequent revision |
|
my $persistent=&make_persistent(); |
|
|
|
$r->print(<<BEGINNING); |
|
<html> |
|
<head> |
|
<title>The LearningOnline Network with CAPA</title> |
|
BEGINNING |
|
$r->print(<<RESULTS); |
|
</head> |
|
<body bgcolor="#ffffff"> |
|
<img align=right src=/adm/lonIcons/lonlogos.gif> |
|
<h1>Search Catalog</h1> |
|
<form method="post" action="/adm/searchcat"> |
|
$persistent |
|
<input type='button' value='Revise search request' |
|
onClick='this.form.submit();'> |
|
$closebutton |
|
<hr> |
|
<h3>Helpful Message</h3> |
|
<p> |
|
$message |
|
</p> |
|
</body> |
|
</html> |
|
RESULTS |
|
} |
|
|
|
sub make_persistent { |
|
my $persistent=''; |
|
|
|
map { |
|
if (/^form\./ && !/submit/) { |
|
my $name=$_; |
|
my $key=$name; |
|
$ENV{$key}=~s/\'//g; # do not mess with html field syntax |
|
$name=~s/^form\.//; |
|
$persistent.=<<END; |
|
<input type='hidden' name='$name' value='$ENV{$key}' /> |
|
END |
|
} |
|
} (keys %ENV); |
|
return $persistent; |
|
} |
1; |
1; |
__END__ |
__END__ |