version 1.133, 2002/06/27 19:28:50
|
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 219 END
|
Line 219 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,$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,$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 721 sub selectbox {
|
Line 734 sub selectbox {
|
|
|
=pod |
=pod |
|
|
=item &advancedsearch() |
=item &parse_advanced_search() |
|
|
|
Parse advanced search form and return the following: |
|
|
|
=over 4 |
|
|
|
=item $query Scalar containing an SQL query. |
|
|
Parse advanced search results. |
=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,$hidden)=@_; |
my ($r)=@_; |
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 766 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 803 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; |
Line 842 sub advancedsearch {
|
Line 867 sub advancedsearch {
|
push @$libraries_to_query,$_; |
push @$libraries_to_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). |
|
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,undef,undef, |
|
$libraries_to_query); |
|
} |
|
else { |
|
$reply=&Apache::lonnet::metadata_query($query, |
|
$customquery,$customshow, |
|
$libraries_to_query); |
|
} |
|
&output_results('Advanced',$r,$customquery,$reply,$hidden); |
|
return OK; |
|
} elsif ($customquery) { |
} elsif ($customquery) { |
my $reply; # reply hash reference |
$query = ''; |
$reply=&Apache::lonnet::metadata_query('', |
|
$customquery,$customshow, |
|
$libraries_to_query); |
|
&output_results('Advanced',$r,$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 879 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,$hidden)=@_; |
my ($r)=@_; |
# 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 914 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,$query,$reply,$hidden); |
|
|
|
return OK; |
|
} |
} |
|
|
|
|
Line 1113 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,$query,$replyref,$hidden)=@_; |
my ($mode,$r,$replyref,$hidden)=@_; |
my %rhash=%{$replyref}; |
my %rhash=%{$replyref}; |
my $compiledresult=''; |
my $compiledresult=''; |
my $timeremain=300; # (seconds) |
my $timeremain=300; # (seconds) |
Line 1372 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*$/ ) { |