--- loncom/interface/lonsearchcat.pm 2002/06/18 21:36:38 1.121
+++ loncom/interface/lonsearchcat.pm 2002/07/12 14:36:16 1.141
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.121 2002/06/18 21:36:38 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.141 2002/07/12 14:36:16 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -40,7 +40,7 @@
=head1 NAME
-lonsearchcat
+lonsearchcat - LONCAPA Search Interface
=head1 SYNOPSIS
@@ -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,52 +101,30 @@ 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
=item $importbutton
-button to take the selecte results and go to group sorting
-
-=item $hidden
-
-holds 'hidden' html forms
-
-=item $scrout
-
-string that holds portions of the screen output
-
-=item $yourself
-
-allows for quickly limiting to oneself
+button to take the select results and go to group sorting
=item %hash
The ubiquitous database hash
-=item $basicviewselect and $advancedviewselect
-
-View selection forms. These are not actually global and will be
-moved soon.
-
=item $diropendb
The full path to the (temporary) search database file. This is set and
used in &handler() and is also used in &output_results().
+=item %Views
+
+Hash which associates an output view description with the function
+that produces it. Adding a new view type should be as easy as
+adding a line to the definition of this hash and making sure the function
+takes the proper parameters.
+
=back
=cut
@@ -154,79 +132,45 @@ 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
-my $hidden; # Holds 'hidden' html forms
# -- miscellaneous variables
-my $scrout; # string that holds portions of the screen output
-my $yourself; # allows for quickly limiting to oneself
my %hash; # database hash
+my $diropendb = ""; # db file
-# ------------------------------------------ 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
-my $basicviewselect=<
-
-
-
-
-
-END
-my $advancedviewselect=<
-
-
-
-
-
-END
+# View Description Function Pointer
+my %Views = ("Detailed Citation View" => \&detailed_citation_view,
+ "Summary View" => \&summary_view,
+ "Fielded Format" => \&fielded_format_view,
+ "XML/SGML" => \&xml_sgml_view );
-#------------------------------------------------------------- global variables
-my $diropendb = "";
-my $domain = "";
+######################################################################
+######################################################################
-# ----------------------------------------------------------------------- BEGIN
+=pod
-=pod
+=item &handler() - main handler invoked by httpd child
-=item BEGIN block
+=item Variables
-Load %hostdomains and %hostips with data from lonnet.pm. Only library
-servers are considered.
+=over 4
-=cut
+=item $hidden
-BEGIN {
- foreach (keys (%Apache::lonnet::libserv)) {
- $hostdomains{$_}=$Apache::lonnet::hostdom{$_};
- $hostips{$_}=$Apache::lonnet::hostip{$_};
- }
-}
+holds 'hidden' html forms
-######################################################################
-######################################################################
+=item $scrout
-=pod
+string that holds portions of the screen output
-=item &handler() - main handler invoked by httpd child
+=back
=cut
######################################################################
######################################################################
-# ----------------------------- Handling routine called via Apache and mod_perl
sub handler {
my $r = shift;
untie %hash;
@@ -236,38 +180,40 @@ sub handler {
return OK if $r->header_only;
my $domain = $r->dir_config('lonDefDomain');
- $diropendb= "/home/httpd/perl/tmp/".&Apache::lonnet::unescape($domain).
- "\_".&Apache::lonnet::unescape($ENV{'user.name'})."_searchcat.db";
+ $diropendb= "/home/httpd/perl/tmp/".&Apache::lonnet::escape($domain).
+ "\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['catalogmode','launch','acts','mode','form','element']);
-
+ ['catalogmode','launch','acts','mode','form','element',
+ 'reqinterface']);
+ ##
+ ## Clear out old values from database
+ ##
if ($ENV{'form.launch'} eq '1') {
if (tie(%hash,'GDBM_File',$diropendb,&GDBM_WRCREAT,0640)) {
&start_fresh_session();
untie %hash;
- }
- else {
+ } else {
$r->print('Unable to tie hash to db '.
'file');
return OK;
}
}
-
-# --------------------------- Produce some output, so people know it is working
-
+ ##
+ ## Produce some output, so people know it is working
+ ##
$r->print("\n");
$r->rflush;
-
-# ----------------------------------- configure dynamic components of interface
-
+ ##
+ ## Configure dynamic components of interface
+ ##
+ my $hidden; # Holds 'hidden' html forms
if ($ENV{'form.catalogmode'} eq 'interactive') {
$hidden="".
"\n";
$closebutton=""."\n";
- }
- elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
+ } elsif ($ENV{'form.catalogmode'} eq 'groupsearch') {
$hidden=<
END
@@ -279,69 +225,238 @@ END
onClick='javascript:select_group()'>
END
}
- $hidden .= <
-
-
-
-END
-# ------------------------------------------------------ Determine current user
- $yourself=$ENV{'user.name'}.'@'.$ENV{'user.domain'};
+ $hidden .= &make_persistent({ "form.mode" => $ENV{'form.mode'},
+ "form.form" => $ENV{'form.form'},
+ "form.element" => $ENV{'form.element'},
+ "form.date" => 2 });
+ ##
+ ## What are we doing?
+ ##
+ my $searchtype;
+ $searchtype = 'Basic' if ($ENV{'form.basicsubmit'} eq 'SEARCH');
+ $searchtype = 'Advanced' if ($ENV{'form.advancedsubmit'} eq 'SEARCH');
+ if ($searchtype) {
+ # We are running a search
+ my ($query,$customquery,$customshow,$libraries) =
+ (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);
+ } else {
+ #
+ # We need to get information to search on
+ #
+ # Set the default view if it is not already set.
+ if (!defined($ENV{'form.viewselect'})) {
+ $ENV{'form.viewselect'} ="Detailed Citation View";
+ }
+ # Output the advanced interface
+ if ($ENV{'form.reqinterface'} eq 'advanced') {
+ $r->print(&advanced_search_form($closebutton,$hidden));
+ } else {
+ # Output normal search interface
+ $r->print(&basic_search_form($closebutton,$hidden));
+ }
+ }
+ return OK;
+}
-# --- Now, depending on the interface actions, do one of three things here:
-# --- 1. a basic search
-# --- 2. an advanced search
-# --- 3. output a search interface
+######################################################################
+######################################################################
-# ----------------------------------- See if a search invocation should be done
- if ($ENV{'form.basicsubmit'} eq 'SEARCH') {
- untie %hash; return &basicsearch($r,\%ENV);
- }
- elsif ($ENV{'form.advancedsubmit'} eq 'SEARCH') {
- untie %hash; return &advancedsearch($r,\%ENV);
- }
+=pod
-# ----------------------------- Else, begin building search interface to output
- $scrout=''; # building a part of screen output
- $scrout.=&searchphrasefield('Limit by title','title',
- $ENV{'form.title'});
+=item &basic_search_form()
- $scrout.=&searchphrasefield('Limit by author','author',
- $ENV{'form.author'});
+Returns a scalar which holds html for the basic search form.
- $scrout.=&searchphrasefield('Limit by subject','subject',
- $ENV{'form.subject'});
+=cut
- $scrout.=&searchphrasefield('Limit by keywords','keywords',
- $ENV{'form.keywords'});
+######################################################################
+######################################################################
- $scrout.=&searchphrasefield('Limit by URL','url',
- $ENV{'form.url'});
+sub basic_search_form{
+ my ($closebutton,$hidden) = @_;
+ my $scrout=<<"ENDDOCUMENT";
+
+
+The LearningOnline Network with CAPA
+
+
+
+
+