--- loncom/interface/lonsearchcat.pm	2006/06/19 09:40:18	1.270
+++ loncom/interface/lonsearchcat.pm	2006/07/28 19:16:08	1.274
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.270 2006/06/19 09:40:18 www Exp $
+# $Id: lonsearchcat.pm,v 1.274 2006/07/28 19:16:08 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');
@@ -2133,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
@@ -2335,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');
@@ -3093,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'};
@@ -3213,7 +3204,7 @@ sub detailed_citation_view {
     $result .= '<b>'.$prefix.
         '<img src="'.&Apache::loncommon::icon($values{'url'}).'" />'.'&nbsp;'.
         '<a href="'.$jumpurl.'" '.
-        'target="search_preview">'.$values{'title'}."</a></b>\n";
+        'target="preview">'.$values{'title'}."</a></b>\n";
     $result .= "<p>\n";
     $result .= '<b>'.$values{'author'}.'</b>,'.
         ' <i>'.$values{'owner'}.'</i><br />';
@@ -3280,9 +3271,9 @@ sub detailed_citation_view {
             $result .= '<b>'.&mt($field->{'translate'}).'</b>';
             foreach my $item (split(',',$values{$field->{'name'}})){
                 $result .= 
-		  &Apache::lonhtmlcommon::crumbs($item,
-		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
-		  '/res',
+		  &Apache::lonhtmlcommon::crumbs(&Apache::lonnet::clutter($item),
+		  'preview',
+		  '',
 		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
             }
         } elsif (exists($field->{'format'}) && $field->{'format'} ne ''){
@@ -3291,11 +3282,15 @@ sub detailed_citation_view {
                                   $values{$field->{'name'}}))."<br />\n";
         } else {
             if ($field->{'special'} eq 'url link') {
-                $result.=
+               if ($jumpurl=~/^http\:\/\//) {
+                 $result.='<tt>'.$jumpurl.'</tt>';
+               } else {
+                 $result .=
 		  &Apache::lonhtmlcommon::crumbs($jumpurl,
-		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+		  'preview',
 		  '',
 		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),3,0,1);
+               }
             } else {
                 $result.= &mt($field->{'translate'},
                               $values{$field->{'name'}});
@@ -3351,15 +3346,19 @@ sub summary_view {
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
-    my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
-		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+    my $link;
+    if ($jumpurl=~/^\/ext\//) {
+	$jumpurl=~s/^\/ext\//http\:\/\//;
+	$link='<br /><tt>'.$jumpurl.'</tt>';
+    } else {
+	$link=&Apache::lonhtmlcommon::crumbs($jumpurl,
+		  'preview',
 		  '',
 		  (($env{'form.catalogmode'} eq 'import')?'parent.statusframe.document.forms.statusform':''),2,0,1);
-
+    }
     $result.=<<END;
 <a href="$jumpurl" 
-   target='search_preview'>$values{'title'}</a>$link
+   target='preview'>$values{'title'}</a>$link
 $values{'author'}, $values{'owner'} -- $values{'lastrevisiondate'}<br />
 $values{'copyrighttag'}<br />
 $values{'extrashow'}
@@ -3392,11 +3391,16 @@ sub summary_preview {
 sub compact_view {
     my ($prefix,%values) = @_;
     my $jumpurl=$values{'url'};
-    $jumpurl=~s/^\/ext\//http\:\/\//;
-    my $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
-		  (($env{'form.catalogmode'} eq 'import')?'_top':'preview'),
+    my $link;
+    if ($jumpurl=~/^\/ext\//) {
+	$jumpurl=~s/^\/ext\//http\:\/\//;
+	$link='<tt>'.$jumpurl.'</tt>';
+    } else {
+        $link=&Apache::lonhtmlcommon::crumbs($jumpurl,
+		  'preview',
 		  '',
 		  (($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'}) && 
@@ -3405,7 +3409,7 @@ sub compact_view {
         if (! defined($tmp)) { $tmp = 'undefined'; }
         $result .= '&nbsp;'.$tmp.'&nbsp;';
     }
-    $result.='&nbsp;<a href="'.$jumpurl.'" target="search_preview">'.
+    $result.='&nbsp;<a href="'.$jumpurl.'" target="preview">'.
         $values{'title'}.'</a>'.('&nbsp;'x2).$link.
         '<b>'.$values{'author'}.'</b> ('.$values{'domain'}.')<br />';
     return $result;
@@ -3435,7 +3439,7 @@ $prefix <img src="$icon" />
 <dl>
 <dt>URL:</dt>
     <dd><a href="$jumpurl" 
-         target='search_preview'>$values{'url'}</a></dd>
+         target='preview'>$values{'url'}</a></dd>
 END
     foreach my $field ('title','author','domain','subject','keywords','notes',
                        'mimetag','language','creationdate','lastrevisiondate',