--- loncom/interface/lonsearchcat.pm 2002/06/24 15:09:52 1.126
+++ loncom/interface/lonsearchcat.pm 2002/06/26 16:04:13 1.130
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.126 2002/06/24 15:09:52 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.130 2002/06/26 16:04:13 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -67,14 +67,14 @@ search (on a server basis) is displayed
###############################################################################
###############################################################################
+###############################################################################
## ##
## ORGANIZATION OF THIS PERL MODULE ##
## ##
## 1. Modules used by this module ##
-## 2. Choices for different output views (detailed, summary, xml, etc) ##
-## 3. BEGIN block (to be run once after compilation) ##
-## 4. Handling routine called via Apache and mod_perl ##
-## 5. Other subroutines ##
+## 2. Variables used throughout the module ##
+## 3. handler subroutine called via Apache and mod_perl ##
+## 4. Other subroutines ##
## ##
###############################################################################
@@ -101,18 +101,6 @@ use Apache::loncommon();
=over 4
-=item %hostdomains
-
-matches host name to host domain
-
-=item %hostips
-
-matches host name to host ip
-
-=item %hitcount
-
-stores number of hits per host
-
=item $closebutton
button that closes the search window
@@ -137,46 +125,13 @@ used in &handler() and is also used in &
######################################################################
######################################################################
-# -- information holders
-my %hostdomains; # matches host name to host domain
-my %hostips; # matches host name to host ip
-my %hitcount; # stores number of hits per host
-
# -- dynamically rendered interface components
my $closebutton; # button that closes the search window
my $importbutton; # button to take the selected results and go to group sorting
# -- miscellaneous variables
-my $yourself; # allows for quickly limiting to oneself
my %hash; # database hash
-
-# ------------------------------------------ choices for different output views
-# Detailed Citation View ---> sub detailed_citation_view
-# Summary View ---> sub summary_view
-# Fielded Format ---> sub fielded_format_view
-# XML/SGML ---> sub xml_sgml_view
-
-#------------------------------------------------------------- global variables
-my $diropendb = "";
-my $domain = "";
-
-# ----------------------------------------------------------------------- BEGIN
-
-=pod
-
-=item BEGIN block
-
-Load %hostdomains and %hostips with data from lonnet.pm. Only library
-servers are considered.
-
-=cut
-
-BEGIN {
- foreach (keys (%Apache::lonnet::libserv)) {
- $hostdomains{$_}=$Apache::lonnet::hostdom{$_};
- $hostips{$_}=$Apache::lonnet::hostip{$_};
- }
-}
+my $diropendb = ""; # db file
######################################################################
######################################################################
@@ -268,10 +223,10 @@ END
##
if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
# Perform basic search and give results
- return &basicsearch($r,\%ENV,$hidden);
+ return &basicsearch($r,$hidden);
} elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
# Perform advanced search and give results
- return &advancedsearch($r,\%ENV,$hidden);
+ return &advancedsearch($r,$hidden);
} elsif ($ENV{'form.reqinterface'} eq 'advanced') {
# Output the advanced interface
$r->print(&advanced_search_form($closebutton,$hidden));
@@ -318,7 +273,8 @@ sub basic_search_form{
$hidden
Basic Search
-Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below.
+Enter terms or quoted phrases separated by AND, OR, or NOT
+then press SEARCH below.
@@ -334,15 +290,14 @@ ENDDOCUMENT
$closebutton
-
-
@@ -367,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";
@@ -381,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.
@@ -579,7 +548,46 @@ the day, month, and year.
=item &selectbox()
-Returns html selection form.
+Returns a scalar containing an html form.
+
+Inputs:
+
+=over 4
+
+=item $title
+
+Printed above the select box, in uppercase.
+
+=item $name
+
+The name element of the tag.
+
+=item $default
+
+The default value of the form. Can be $anyvalue or in @idlist.
+
+=item $anyvalue
+
+The ';
}
else {$selout.='>'.&{$functionref}($_).'';}
}
- return $selout.'';
+ return $selout.'';
}
######################################################################
@@ -689,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',
@@ -727,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});
}
@@ -736,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'}\")";
}
@@ -792,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
@@ -819,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;
@@ -853,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;
}
@@ -1045,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(<
-
-
-
');
- $r->rflush();
- #
# make the pop-up window for status
#
$r->print(&make_popwin(%rhash));
@@ -1143,10 +1136,10 @@ CATALOGCONTROLS
return OK;
}
@results=<$fh> if $fh;
- $hitcount{$rkey}=@results+0;
+ my $hits =@results;
&popwin_js($r,'popwin.hc["'.$rkey.'"]='.
- $hitcount{$rkey}.';');
- $hitcountsum+=$hitcount{$rkey};
+ $hits.';');
+ $hitcountsum+=$hits;
&popwin_js($r,'popwin.document.forms.popremain.'.
'numhits.value='.$hitcountsum.';');
} else {
@@ -1192,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'};
@@ -1221,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 );
@@ -1244,6 +1227,9 @@ END
$compiledresult.=&xml_sgml_view
(%Fields, hostname => $rkey );
}
+ if ($compiledresult or $servercount!=$servernum) {
+ $compiledresult.="
";
+ }
}
untie %hash;
}
@@ -1392,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 inputs directly from from %ENV. The following environment variables
-are checked:
+Takes most inputs directly from %ENV, except $mode.
+
+=over 4
+
+=item $mode is either (at this writing) 'Basic' or 'Advanced'
+
+=back
+
+The following environment variables are checked:
=over 4
@@ -1418,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.=<
-The LearningOnline Network with CAPA
+$title
BEGINNING
# conditional output of script functions dependent on the mode in
# which the search was invoked
@@ -1506,6 +1508,12 @@ SCRIPT
}
SCRIPT
+ $result.=<
+
+
+
$title
+END
return $result;
}
@@ -1547,13 +1555,14 @@ sub make_popwin {
$hcinit.="hc[\"$sk\"]=\"not yet connected...\";";
}
$grid.=" hitcount=".$hc;
- $grid.=" domain=".$hostdomains{$sk};
- $grid.=" IP=".$hostips{$sk};
+ $grid.=" domain=".$Apache::lonnet::hostdom{$sk};
+ $grid.=" IP=".$Apache::lonnet::hostip{$sk};
# '+"'"+'">'+
$grid.="'+\"'\"+')\">'+";
$grid.="\n";
- $grid.="''+\n";
+ $grid.="''+\n";
$grid.="' '+\n" unless $sn%10;
$sn++;
}
@@ -1628,30 +1637,17 @@ extra custom metadata to show.
sub detailed_citation_view {
my %values = @_;
my $result=<$values{'owner'}, last revised $values{'lastrevisiondate'}