--- loncom/interface/lonsearchcat.pm	2002/08/07 12:37:16	1.152
+++ 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.152 2002/08/07 12:37:16 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.154 2002/08/21 17:18:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -390,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>
@@ -402,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.
@@ -474,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>
@@ -486,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">
@@ -1673,6 +1669,7 @@ sub print_sort_form {
 </head>
 <body>
 <form name="statusform" action="" method="post">
+<input type="hidden" name="Queue" value="" />
 END
 
 #<h2>Sort Results</h2>
@@ -2051,7 +2048,13 @@ END
     # We have run out of time or run out of servers to talk to and
     # results to get.  
     $r->print("</body></html>");
-    $r->print("<script>window.location='/adm/searchcat?phase=sort&persistent_db_id=$ENV{'form.persistent_db_id'}';</script>");
+    if ($ENV{'form.catalogmode'} ne 'groupsearch') {
+        $r->print("<script>".
+                      "window.location='/adm/searchcat?".
+                      "phase=sort&".
+                      "persistent_db_id=$ENV{'form.persistent_db_id'}';".
+                  "</script>");
+    }
     return;
 }
 
@@ -2484,13 +2487,13 @@ sub search_results_header {
 	parent.close();
     }
     function changeTitle(val) {
-	if (opener.inf.document.forms.resinfo.elements.t) {
-	    opener.inf.document.forms.resinfo.elements.t.value=val;
+	if (parent.opener.inf.document.forms.resinfo.elements.t) {
+	    parent.opener.inf.document.forms.resinfo.elements.t.value=val;
 	}
     }
     function changeURL(val) {
-	if (opener.inf.document.forms.resinfo.elements.u) {
-	    opener.inf.document.forms.resinfo.elements.u.value=val;
+	if (parent.opener.inf.document.forms.resinfo.elements.u) {
+	    parent.opener.inf.document.forms.resinfo.elements.u.value=val;
 	}
     }
 </script>
