version 1.81, 2001/03/27 12:49:18
|
version 1.85, 2001/03/27 19:32:28
|
Line 560 sub advancedsearch {
|
Line 560 sub advancedsearch {
|
$customquery=&build_custommetadata_query('custommetadata', |
$customquery=&build_custommetadata_query('custommetadata', |
$ENV{'form.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=''; |
my $reply=''; |
unless ($customquery) { |
unless ($customquery or $customshow) { |
$reply=&Apache::lonnet::metadata_query($query); |
$reply=&Apache::lonnet::metadata_query($query); |
} |
} |
else { |
else { |
$reply=&Apache::lonnet::metadata_query($query,$customquery); |
$reply=&Apache::lonnet::metadata_query($query, |
|
$customquery,$customshow); |
} |
} |
&output_results('Advanced',$r,$envhash,$customquery,$reply); |
&output_results('Advanced',$r,$envhash,$customquery,$reply); |
} |
} |
else { |
else { |
&output_results('Advanced',$r,$envhash,$query); |
&output_results('Advanced',$r,$envhash,$query); |
} |
} |
|
$r->print(' '); # just in case.. hrrmm.. |
return OK; |
return OK; |
} |
} |
|
|
Line 689 sub output_results {
|
Line 698 sub output_results {
|
} |
} |
my $customdata=''; |
my $customdata=''; |
foreach my $result (@results) { |
foreach my $result (@results) { |
$result=~/(\&custom.*)$/; # grab all custom metadata |
if ($result=~/^(custom\=.*)$/) { # grab all custom metadata |
$customdata=$1; |
$customdata.=$result; |
$result=~s/\&custom.*$//; # remove custom metadata |
} |
} |
} |
foreach my $result (@results) { |
foreach my $result (@results) { |
|
next if $result=~/^custom\=/; |
|
chomp $result; |
|
next unless $result; |
my @fields=map |
my @fields=map |
{&Apache::lonnet::unescape($_)} |
{&Apache::lonnet::unescape($_)} |
(split(/\,/,$result)); |
(split(/\,/,$result)); |