[LON-CAPA-cvs] cvs: loncom(fixes_0_5) /interface lonsearchcat.pm

matthew lon-capa-cvs@mail.lon-capa.org
Mon, 16 Sep 2002 13:05:54 -0000


matthew		Mon Sep 16 09:05:54 2002 EDT

  Modified files:              (Branch: fixes_0_5)
    /loncom/interface	lonsearchcat.pm 
  Log:
  Backport of initial fix for bug 775.
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.153 loncom/interface/lonsearchcat.pm:1.153.2.1
--- loncom/interface/lonsearchcat.pm:1.153	Fri Aug 16 09:52:51 2002
+++ loncom/interface/lonsearchcat.pm	Mon Sep 16 09:05:54 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.153 2002/08/16 13:52:51 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.153.2.1 2002/09/16 13:05:54 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -171,6 +171,10 @@
     $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.
     ##
@@ -226,9 +230,8 @@
     ## 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') && 
-        ($ENV{'form.phase'} eq 'results')) {
+    if (($ENV{'form.launch'} eq '1') && 
+        ($ENV{'form.catalogmode'} eq 'groupsearch')) {
 	if (tie(%groupsearch_db,'GDBM_File',$diropendb,&GDBM_WRCREAT(),0640)) {
 	    &start_fresh_session();
 	    untie %groupsearch_db;