--- loncom/interface/lonsearchcat.pm 2002/06/19 19:40:38 1.122
+++ loncom/interface/lonsearchcat.pm 2002/07/03 19:11:09 1.134
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.122 2002/06/19 19:40:38 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.134 2002/07/03 19:11:09 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,47 +101,18 @@ 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
@@ -154,79 +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
-my $basicviewselect=<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"; + + +