--- loncom/interface/lonsearchcat.pm	2002/09/16 20:09:45	1.157
+++ loncom/interface/lonsearchcat.pm	2002/11/03 19:03:29	1.160
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.157 2002/09/16 20:09:45 www Exp $
+# $Id: lonsearchcat.pm,v 1.160 2002/11/03 19:03:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -191,7 +191,8 @@ sub handler {
     ##
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
              ['catalogmode','launch','acts','mode','form','element','pause',
-              'phase','persistent_db_id','table','start','show']);
+              'phase','persistent_db_id','table','start','show',
+              'cleargroupsort']);
     ##
     ## The following is a trick - we wait a few seconds if asked to so
     ##     the daemon running the search can get ahead of the daemon
@@ -242,11 +243,13 @@ 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.cleargroupsort'} eq '1') || 
+        (($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;
+            delete($ENV{'form.cleargroupsort'});
 	} else {
             # This is a stupid error to give to the user.  
             # It really tells them nothing.
@@ -436,7 +439,9 @@ ENDDOCUMENT
         ' ';
     my $checkbox = &simplecheckbox('related',$ENV{'form.related'});
     $scrout.=<<END;
-</td><td><a href="/adm/searchcat?phase=disp_adv">Advanced Search</a></td></tr>
+</td><td><a
+href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}"
+>Advanced Search</a></td></tr>
 <tr><td>$checkbox use related words</td><td></td></tr>
 </table>
 </p>
@@ -1871,6 +1876,7 @@ sub revise_button {
     $revise_phase = 'disp_adv' if ($ENV{'form.searchmode'} eq 'advanced');
     my $newloc = '/adm/searchcat'.
         '?persistent_db_id='.$ENV{'form.persistent_db_id'}.
+            '&cleargroupsort=1'.
             '&phase='.$revise_phase;
     my $result = qq{<input type="button" value="Revise search" name="revise"} .
         qq{ onClick="parent.location='$newloc';" /> };
@@ -1972,7 +1978,7 @@ END
     my $time_remaining = $max_time - (time - $starttime) ;
     my $last_time = $time_remaining;
     &update_seconds($r,$time_remaining);
-    while (($time_remaining > 0) && 
+    while (($time_remaining > 0) &&
            ((@Servers_to_contact) || keys(%Server_status))) {
         # Send out a search request if it needs to be done.
         if (@Servers_to_contact) {
@@ -1990,7 +1996,13 @@ END
             # left to contact.  
             sleep(1); 
         }
-        &update_status($r,'waiting on '.(join(' ',keys(%Server_status))));
+        #
+        if (scalar (keys(%Server_status))) {
+            &update_status($r,'waiting on '.(join(' ',keys(%Server_status))));
+        }
+        #
+        # Loop through the servers we have contacted but do not
+        # have results from yet, looking for results.
         while (my ($server,$status) = each(%Server_status)) {
             last if ($connection->aborted());
             if ($status eq 'con_lost') {
@@ -2053,6 +2065,7 @@ END
         }
         last if ($connection->aborted());
         # Finished looping through the servers
+        $starttime = time if (@Servers_to_contact);
         $time_remaining = $max_time - (time - $starttime) ;
         if ($last_time - $time_remaining > 0) {
             $last_time = $time_remaining;
@@ -2144,6 +2157,10 @@ sub display_results {
         return;
     }
     ##
+    ## $checkbox_num is a count of the number of checkboxes output on the 
+    ## page this is used only during catalogmode=groupsearch.
+    my $checkbox_num = 0;
+    ##
     ## Get the catalog controls setup
     ##
     my $action = "/adm/searchcat?phase=results";
@@ -2222,7 +2239,8 @@ sub display_results {
         }
         my %Fields = %{&parse_row(@$row)};
         my $output="<p>\n";
-        my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'});
+        my $prefix=&catalogmode_output($Fields{'title'},$Fields{'url'},
+                                       $Fields{'id'},$checkbox_num++);
         # Render the result into html
         $output.= &$viewfunction($prefix,%Fields);
         # Print them out as they come in.
@@ -2253,22 +2271,18 @@ sub display_results {
 
 =pod
 
-=item &catalogmode_output($title,$url)
+=item &catalogmode_output($title,$url,$fnum,$checkbox_num)
 
 Returns html needed for the various catalog modes.  Gets inputs from
-$ENV{'form.catalogmode'}.  Stores data in %groupsearch_db and $fnum 
-(local variable).
+$ENV{'form.catalogmode'}.  Stores data in %groupsearch_db.
 
 =cut
 
 ######################################################################
 ######################################################################
-{ 
-my $fnum = 0;
-
 sub catalogmode_output {
     my $output = '';
-    my ($title,$url) = @_;
+    my ($title,$url,$fnum,$checkbox_num) = @_;
     if ($ENV{'form.catalogmode'} eq 'interactive') {
         $title=~ s/\'/\\\'/g;
         if ($ENV{'form.catalogmode'} eq 'interactive') {
@@ -2284,15 +2298,12 @@ END
         $output.=<<END;
 <font size='-1'>
 <input type="checkbox" name="returnvalues" value="SELECT"
-onClick="javascript:queue($fnum)" />
+onClick="javascript:queue($checkbox_num,$fnum)" />
 </font>
 END
-        $fnum++;
     }
     return $output;
 }
-
-}
 ######################################################################
 ######################################################################
 
@@ -2540,8 +2551,8 @@ SCRIPT
     }
     $result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
 <script type="text/javascript">
-    function queue(val) {
-        if (document.forms.results.returnvalues[val].checked) {
+    function queue(checkbox_num,val) {
+        if (document.forms.results.returnvalues[checkbox_num].checked) {
             parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
         } else {
             parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
@@ -2596,6 +2607,7 @@ sub print_frames_interface {
 <head>
 <script>
 var targetwin = opener;
+var queue = '';
 </script>
 <title>LON-CAPA Digital Library Search Results</title>
 </head>