--- loncom/interface/lonsearchcat.pm 2002/06/19 20:39:11 1.123
+++ 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.123 2002/06/19 20:39:11 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
@@ -121,18 +109,6 @@ button that closes the search window
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
-
=item %hash
The ubiquitous database hash
@@ -149,61 +125,39 @@ 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
-
-#------------------------------------------------------------- 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;
@@ -217,8 +171,11 @@ sub handler {
"\_".&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();
@@ -229,21 +186,21 @@ sub handler {
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=<Search Catalog
+
+ +$closebutton + + + + +
+ + + +ENDDOCUMENT + return $scrout; +} +###################################################################### +###################################################################### -# ----------------------------- Else, begin building search interface to output - $scrout=''; # building a part of screen output - $scrout.=&searchphrasefield('Limit by title','title', - $ENV{'form.title'}); +=pod - $scrout.=&searchphrasefield('Limit by author','author', - $ENV{'form.author'}); +=item &advanced_search_form() - $scrout.=&searchphrasefield('Limit by subject','subject', - $ENV{'form.subject'}); +Returns a scalar which holds html for the advanced search form. - $scrout.=&searchphrasefield('Limit by keywords','keywords', - $ENV{'form.keywords'}); +=cut - $scrout.=&searchphrasefield('Limit by URL','url', - $ENV{'form.url'}); +###################################################################### +###################################################################### +sub advanced_search_form{ + my ($closebutton,$hidden) = @_; + my $advanced_buttons = <<"END"; ++ + +$closebutton + +
+END + my $scrout=<<"ENDHEADER"; + + +