--- loncom/interface/lonsearchcat.pm	2002/09/16 13:05:54	1.153.2.1
+++ loncom/interface/lonsearchcat.pm	2002/08/21 17:18:08	1.154
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.153.2.1 2002/09/16 13:05:54 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.154 2002/08/21 17:18:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,10 +171,6 @@ sub handler {
     $r->content_type('text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    ##
-    ## Prevent caching of the search interface window.  Hopefully this means
-    ## we will get the launch=1 passed in a little more.
-    &Apache::loncommon::no_cache($r);
     ## 
     ## Pick up form fields passed in the links.
     ##
@@ -230,8 +226,9 @@ END
     ## Clear out old values from groupsearch database
     ##
     untie %groupsearch_db if (tied(%groupsearch_db));
-    if (($ENV{'form.launch'} eq '1') && 
-        ($ENV{'form.catalogmode'} eq 'groupsearch')) {
+    if ($ENV{'form.launch'} eq '1' && 
+        ($ENV{'form.catalogmode'} eq 'groupsearch') && 
+        ($ENV{'form.phase'} eq 'results')) {
 	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	    &start_fresh_session();
 	    untie %groupsearch_db;
@@ -393,6 +390,7 @@ Returns a scalar which holds html for th
 
 sub print_basic_search_form{
     my ($r,$closebutton) = @_;
+    my $bodytag=&Apache::loncommon::bodytag('Catalog Search');
     my $scrout=<<"ENDDOCUMENT";
 <html>
 <head>
@@ -405,13 +403,10 @@ sub print_basic_search_form{
     }
 </script>
 </head>
-<body bgcolor="#FFFFFF">
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Search Catalog</h1>
+$bodytag
 <form method="post" action="/adm/searchcat">
 <input type="hidden" name="phase" value="basic_search" />
 $hidden_fields
-<h3>Basic Search</h3>
 <p>
 Enter terms or phrases separated by AND, OR, or NOT 
 then press SEARCH below.
@@ -477,6 +472,7 @@ END
     if (!defined($ENV{'form.viewselect'})) {
         $ENV{'form.viewselect'} ="Detailed Citation View";
     }
+    my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');
     my $scrout=<<"ENDHEADER";
 <html>
 <head>
@@ -489,10 +485,7 @@ END
     }
 </script>
 </head>
-<body bgcolor="#FFFFFF">
-<img align='right' src='/adm/lonIcons/lonlogos.gif' />
-<h1>Advanced Catalog Search</h1>
-<hr />
+$bodytag
 Enter terms or phrases separated by search operators 
 such as AND, OR, or NOT.<br />
 <form method="post" action="/adm/searchcat">
