version 1.130, 2002/06/26 16:04:13
|
version 1.133, 2002/06/27 19:28:50
|
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? |
## |
## |
Line 273 sub basic_search_form{
|
Line 271 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 346 END
|
Line 344 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"> |
<form method="post" action="/adm/searchcat"> |
$advanced_buttons |
$advanced_buttons |
Line 388 ENDHEADER
|
Line 386 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 493 to be somewhat persistent.
|
Line 525 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 667 sub selectbox {
|
Line 702 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 706 sub advancedsearch {
|
Line 741 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 715 sub advancedsearch {
|
Line 750 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 735 sub advancedsearch {
|
Line 776 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 783 sub advancedsearch {
|
Line 821 sub advancedsearch {
|
my @fields=split(/\s+/,$customshow); |
my @fields=split(/\s+/,$customshow); |
$customshow=join(" ",@fields); |
$customshow=join(" ",@fields); |
} |
} |
|
## --------------------------------------------------------------- |
|
## Deal with restrictions to given domains |
|
## |
|
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,$_; |
|
} |
|
} |
|
## --------------------------------------------------------------- |
|
# |
# Send query statements over the network to be processed by either the SQL |
# Send query statements over the network to be processed by either the SQL |
# database or a recursive scheme of 'grep'-like actions (for custom |
# database or a recursive scheme of 'grep'-like actions (for custom |
# metadata). |
# metadata). |
Line 791 sub advancedsearch {
|
Line 852 sub advancedsearch {
|
$query="select * from metadata where $query"; |
$query="select * from metadata where $query"; |
my $reply; # reply hash reference |
my $reply; # reply hash reference |
unless ($customquery or $customshow) { |
unless ($customquery or $customshow) { |
$reply=&Apache::lonnet::metadata_query($query); |
$reply=&Apache::lonnet::metadata_query($query,undef,undef, |
|
$libraries_to_query); |
} |
} |
else { |
else { |
$reply=&Apache::lonnet::metadata_query($query, |
$reply=&Apache::lonnet::metadata_query($query, |
$customquery,$customshow); |
$customquery,$customshow, |
|
$libraries_to_query); |
} |
} |
&output_results('Advanced',$r,$customquery,$reply,$hidden); |
&output_results('Advanced',$r,$customquery,$reply,$hidden); |
return OK; |
return OK; |
} elsif ($customquery) { |
} elsif ($customquery) { |
my $reply; # reply hash reference |
my $reply; # reply hash reference |
$reply=&Apache::lonnet::metadata_query('', |
$reply=&Apache::lonnet::metadata_query('', |
$customquery,$customshow); |
$customquery,$customshow, |
|
$libraries_to_query); |
&output_results('Advanced',$r,$customquery,$reply,$hidden); |
&output_results('Advanced',$r,$customquery,$reply,$hidden); |
return OK; |
return OK; |
} |
} |
Line 1059 sub output_results {
|
Line 1123 sub output_results {
|
my $viewselect=$ENV{'form.viewselect'}; |
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 results header |
# spit out the results header |
$r->print(&search_results_header($mode)); |
$r->print(&search_results_header($mode)); |
$r->rflush(); |
$r->rflush(); |
Line 1801 sub filled {
|
Line 1865 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 1847 Output a full html page with an error me
|
Line 1911 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> |