--- loncom/interface/lonsearchcat.pm	2006/06/08 13:56:31	1.267
+++ loncom/interface/lonsearchcat.pm	2006/07/17 19:47:20	1.273
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.267 2006/06/08 13:56:31 www Exp $
+# $Id: lonsearchcat.pm,v 1.273 2006/07/17 19:47:20 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1540,12 +1540,12 @@ sub parse_domain_restrictions {
         $domain_hash{$_}++;
     }
     if ($domain_hash{'any'}) {
-        $pretty_domains_string = "In all LON-CAPA domains.";
+        $pretty_domains_string = &mt("in all LON-CAPA domains.");
     } else {
         if (@allowed_domains > 1) {
-            $pretty_domains_string = "In LON-CAPA domains:";
+            $pretty_domains_string = &mt("in LON-CAPA domains:");
         } else {
-            $pretty_domains_string = "In LON-CAPA domain ";
+            $pretty_domains_string = &mt("in LON-CAPA domain ");
         }
         foreach (sort @allowed_domains) {
             $pretty_domains_string .= "<b>".$_."</b> ";
@@ -1614,6 +1614,9 @@ sub parse_basic_search {
     #}
     my $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
     #
+    if ($env{'form.related'}) {
+	$pretty_search_string.=' '.&mt('(including related words)');
+    }
     if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
         $pretty_search_string .= ' '.$pretty_domains_string;
     }
@@ -2104,7 +2107,7 @@ sub print_sort_form {
 END
 
     my $start_page = &Apache::loncommon::start_page('Results',$js,
-						    {'only_body' => 1});
+						    {'no_title' => 1});
     my $breadcrumbs=
         &Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2113,7 +2116,8 @@ END
 $start_page
 $breadcrumbs
 <form name="statusform" action="" method="post" target="_top">
-<input type="hidden" name="Queue" value="" />
+<input type="hidden" name="catalogmode" value="import" />
+<input type="hidden" name="acts" value="" />
 END
 
 #<h2>Sort Results</h2>
@@ -2132,7 +2136,7 @@ END
 <p>
 There are $total_results matches to your query. $revise
 </p><p>
-Search:$pretty_query_string
+Search: $pretty_query_string
 </p>
 </form>
 END
@@ -2334,7 +2338,7 @@ sub run_search {
     # Print run_search header
     #
     my $start_page = &Apache::loncommon::start_page('Search Status',undef,
-						    {'only_body' => 1});
+						    {'no_title' => 1});
     my $breadcrumbs =
 	&Apache::lonhtmlcommon::breadcrumbs('Searching','Searching',
 					    $env{'form.catalogmode'} ne 'import');
@@ -2342,7 +2346,7 @@ sub run_search {
 $start_page
 $breadcrumbs
 <form name="statusform" action="" method="post">
-<input type="hidden" name="Queue" value="" />
+<input type="hidden" name="acts" value="" />
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -3062,22 +3066,22 @@ SCRIPT
         if (document.forms.results.returnvalues.length != "undefined" &&
             typeof(document.forms.results.returnvalues.length) == "number") {
             if (document.forms.results.returnvalues[checkbox_num].checked) {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='1a'+val+'b';
             } else {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='0a'+val+'b';
             }
         } else {
             if (document.forms.results.returnvalues.checked) {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='1a'+val+'b';
             } else {
-                parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+                parent.statusframe.document.forms.statusform.elements.acts.value +='0a'+val+'b';
             }
         }
     }
     function select_group() {
 	parent.window.location=
     "/adm/groupsort?mode=$env{'form.mode'}&catalogmode=import&acts="+
-	    parent.statusframe.document.forms.statusform.elements.Queue.value;
+	    parent.statusframe.document.forms.statusform.elements.acts.value;
     }
 </script>
 SCRIPT
@@ -3092,18 +3096,6 @@ END
     return $result;
 }
 
-######################################################################
-######################################################################
-sub search_status_header {
-    my $start_page = &Apache::loncommon::start_page('Search Status',undef,
-						    {'only_body' => 1});
-    return <<ENDSTATUS;
-$start_page
-<h3>Search Status</h3>
-Sending search request to LON-CAPA servers.<br />
-ENDSTATUS
-}
-
 sub results_link {
     my $basic_link   = "/adm/searchcat?"."&table=".$env{'form.table'}.
         "&persistent_db_id=".$env{'form.persistent_db_id'};
@@ -3282,7 +3274,7 @@ sub detailed_citation_view {
 		  &Apache::lonhtmlcommon::crumbs($item,
 		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
 		  '/res',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
             }
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
             $result.= &mt($field->{'translate'},
@@ -3294,7 +3286,7 @@ sub detailed_citation_view {
 		  &Apache::lonhtmlcommon::crumbs($jumpurl,
 		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
 		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),3,0,1);
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3352,9 +3344,9 @@ sub summary_view {
     my $jumpurl=$values{'url'};
     $jumpurl=~s/^\/ext\//http\:\/\//;
     my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
-		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+		  (($env{'form.catalogmode'} eq 'import')?'':'preview'),
 		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
 
     $result.=<<END;
 <a href="$jumpurl" 
@@ -3395,7 +3387,7 @@ sub compact_view {
     my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
 		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
 		  '',
-		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1);
+		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),1,1,1).' ';
     my $result = 
         $prefix.'<img src="'.&Apache::loncommon::icon($values{'url'}).'">';
     if (exists($env{'form.sortfield'}) &&