$closebutton - -
@@ -322,6 +322,14 @@ Returns a scalar which holds html for th sub advanced_search_form{ my ($closebutton,$hidden) = @_; + my $advanced_buttons = <<"END"; ++ + +$closebutton + +
+END my $scrout=<<"ENDHEADER"; @@ -336,34 +344,56 @@ sub advanced_search_form{
-Search Catalog
+Advanced Catalog Search
++Enter terms or quoted phrases separated by search operators +such as AND, OR, or NOT.
@@ -534,7 +548,46 @@ the day, month, and year. =item &selectbox() -Returns html selection form. +Returns a scalar containing an html '; } ###################################################################### @@ -644,8 +695,7 @@ Parse advanced search results. ###################################################################### ###################################################################### sub advancedsearch { - my ($r,$envhash,$hidden)=@_; - my %ENV=%{$envhash}; + my ($r,$hidden)=@_; my $fillflag=0; # Clean up fields for safety for my $field ('title','author','subject','keywords','url','version', @@ -682,7 +732,7 @@ sub advancedsearch { my @queries; # Evaluate logical expression AND/OR/NOT phrase fields. foreach my $field ('title','author','subject','notes','abstract','url', - 'keywords','version','owner') { + 'keywords','version','owner','mime') { if ($ENV{'form.'.$field}) { push @queries,&build_SQL_query($field,$ENV{'form.'.$field}); } @@ -691,9 +741,9 @@ sub advancedsearch { 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.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'}\")"; } @@ -747,13 +797,13 @@ sub advancedsearch { $reply=&Apache::lonnet::metadata_query($query, $customquery,$customshow); } - &output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden); + &output_results('Advanced',$r,$customquery,$reply,$hidden); return OK; } elsif ($customquery) { my $reply; # reply hash reference $reply=&Apache::lonnet::metadata_query('', $customquery,$customshow); - &output_results('Advanced',$r,$envhash,$customquery,$reply,$hidden); + &output_results('Advanced',$r,$customquery,$reply,$hidden); return OK; } # should not get to this point @@ -774,8 +824,7 @@ Parse basic search form. ###################################################################### ###################################################################### sub basicsearch { - my ($r,$envhash,$hidden)=@_; - my %ENV=%{$envhash}; + my ($r,$hidden)=@_; # Clean up fields for safety for my $field ('basicexp') { $ENV{"form.$field"}=~s/[^\w\s\(\)\-]//g; @@ -808,7 +857,7 @@ sub basicsearch { # &Apache::lonnet::logthis("metadata query finished:".time); # Output search results - &output_results('Basic',$r,$envhash,$query,$reply,$hidden); + &output_results('Basic',$r,$query,$reply,$hidden); return OK; } @@ -1000,29 +1049,29 @@ contacted, etc.) sub output_results { # &Apache::lonnet::logthis("output_results:".time); my $fnum; # search result counter - my ($mode,$r,$envhash,$query,$replyref,$hidden)=@_; - my %ENV=%{$envhash}; + my ($mode,$r,$query,$replyref,$hidden)=@_; my %rhash=%{$replyref}; my $compiledresult=''; my $timeremain=300; # (seconds) my $elapsetime=0; my $resultflag=0; my $tflag=1; + my $viewselect=$ENV{'form.viewselect'}; # # make query information persistent to allow for subsequent revision my $persistent=&make_persistent(); - # spit out the generic header - $r->print(&search_results_header()); + # spit out the results header + $r->print(&search_results_header($mode)); $r->rflush(); # begin showing the cataloged results - $r->print(<
-Search Catalog
-CATALOGBEGIN - $r->print(<Search Query
CATALOGCONTROLS # - # Remind them what they searched for - # - if ($mode eq 'Basic') { - $r->print('Basic search: '.$ENV{'form.basicexp'}.'
'); - } elsif ($mode eq 'Advanced') { - $r->print('Advanced search '.$query.'
'); - } - $r->print('Search Results
'); - $r->rflush(); - # # make the pop-up window for status # $r->print(&make_popwin(%rhash)); @@ -1147,9 +1185,6 @@ CATALOGCONTROLS $Fields{'extrashow'}=~s/\<\!\-\- $field \-\-\>/ $value/g; } } - if ($compiledresult or $servercount!=$servernum) { - $compiledresult.=""; - } $compiledresult.="\n
\n"; if ($ENV{'form.catalogmode'} eq 'interactive') { my $titleesc=$Fields{'title'}; @@ -1176,13 +1211,6 @@ END # $fnum++; } - my $viewselect; - if ($mode eq 'Basic') { - $viewselect=$ENV{'form.basicviewselect'}; - } - elsif ($mode eq 'Advanced') { - $viewselect=$ENV{'form.advancedviewselect'}; - } if ($viewselect eq 'Detailed Citation View') { $compiledresult.=&detailed_citation_view (%Fields, hostname => $rkey ); @@ -1199,6 +1227,9 @@ END $compiledresult.=&xml_sgml_view (%Fields, hostname => $rkey ); } + if ($compiledresult or $servercount!=$servernum) { + $compiledresult.="
"; + } } untie %hash; } @@ -1347,10 +1378,18 @@ sub handle_custom_fields { =item &search_results_header -Output the proper javascript code to deal with different calling modes. +Output the proper html headers and javascript code to deal with different +calling modes. + +Takes most inputs directly from %ENV, except $mode. + +=over 4 + +=item $mode is either (at this writing) 'Basic' or 'Advanced' + +=back -Takes inputs directly from from %ENV. The following environment variables -are checked: +The following environment variables are checked: =over 4 @@ -1373,12 +1412,20 @@ Checked for existance & 'edit' mode. ###################################################################### ###################################################################### sub search_results_header { + my ($mode) = @_; + $mode = lc($mode); + my $title; + if ($mode eq 'advanced') { + $title = "Advanced Search Results"; + } elsif ($mode eq 'basic') { + $title = "Basic Search Results"; + } my $result = ''; # output beginning of search page $result.=<
+$title
+END return $result; } @@ -1584,30 +1637,17 @@ extra custom metadata to show. sub detailed_citation_view { my %values = @_; my $result=<$values{'title'}
-$values{'author'}
-
-Subject: $values{'subject'}
-Keyword(s): $values{'keywords'}
-Notes: $values{'notes'}
-MIME Type:
-END
- $result.=&Apache::loncommon::filedescription($values{'mime'});
- $result.=<
+
+Subject: $values{'subject'}
+Keyword(s): $values{'keywords'}
+Notes: $values{'notes'}
+MIME Type: $values{'mimetag'}
+Language: $values{'language'}
+Copyright/Distribution: $values{'cprtag'}