--- loncom/interface/lonsearchcat.pm 2002/06/19 20:39:11 1.123
+++ loncom/interface/lonsearchcat.pm 2002/06/20 14:31:31 1.124
@@ -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.124 2002/06/20 14:31:31 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -121,18 +121,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
@@ -157,10 +145,8 @@ my %hitcount; # stores number of hits
# -- 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
@@ -199,11 +185,24 @@ BEGIN {
=item &handler() - main handler invoked by httpd child
+=item Variables
+
+=over 4
+
+=item $hidden
+
+holds 'hidden' html forms
+
+=item $scrout
+
+string that holds portions of the screen output
+
+=back
+
=cut
######################################################################
######################################################################
-# ----------------------------- Handling routine called via Apache and mod_perl
sub handler {
my $r = shift;
untie %hash;
@@ -217,8 +216,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 +231,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 +=pod + +=item &advanced_search_form() + +Returns a scalar which holds html for the advanced search form. + +=cut + +###################################################################### +###################################################################### + +sub advanced_search_form{ + my ($closebutton,$hidden) = @_; + my $scrout=<<"ENDHEADER"; + + +