--- loncom/interface/lonsearchcat.pm	2003/10/24 21:09:24	1.191
+++ loncom/interface/lonsearchcat.pm	2003/12/11 20:59:54	1.194
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.191 2003/10/24 21:09:24 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.194 2003/12/11 20:59:54 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -545,14 +545,15 @@ sub print_basic_search_form{
 $bodytag
 ENDDOCUMENT
 if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
+    my $CatalogSearch=&mt('Catalog Search');
+    my $Statement=&mt('Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below');
     $scrout.=(<<ENDDOCUMENT);
-<h1>Catalog Search</h1>
+<h1>$CatalogSearch</h1>
 <form method="post" action="/adm/searchcat">
 <input type="hidden" name="phase" value="basic_search" />
 $hidden_fields
 <p>
-Enter terms or phrases separated by AND, OR, or NOT 
-then press SEARCH below.
+$Statement.
 </p>
 <p>
 <table>
@@ -565,12 +566,14 @@ ENDDOCUMENT
     my $domaincheckbox = &simplecheckbox('domains',$domain);
     my $srch=&mt('Search');
     my $header=&mt('Advanced Search');
+    my $userelatedwords=&mt('use related words');
+    my $onlysearchdomain=&mt('only search domain');
     $scrout.=<<END;
 </td><td><a
 href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}&mode=$ENV{'form.mode'}"
 >$header</a></td></tr>
-<tr><td>$relatedcheckbox use related words</td>
-    <td>$domaincheckbox only search domain <b>$domain</b></td></tr>
+<tr><td>$relatedcheckbox $userelatedwords</td>
+    <td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr>
 </table>
 </p>
 <p>
@@ -2880,8 +2883,9 @@ extra custom metadata to show.
 ######################################################################
 sub detailed_citation_view {
     my ($prefix,%values) = @_;
+    my $icon=&Apache::loncommon::icon($values{'url'});
     my $result=<<END;
-<b>$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
+<b>$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
     target='search_preview'>$values{'title'}</a></b>
 <p>
 <b>$values{'author'}</b>, <i>$values{'owner'}</i><br />
@@ -2914,8 +2918,9 @@ END
 ######################################################################
 sub summary_view {
     my ($prefix,%values) = @_;
+    my $icon=&Apache::loncommon::icon($values{'url'});
     my $result=<<END;
-$prefix<a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
+$prefix<img src="$icon" /><a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
    target='search_preview'>$values{'author'}</a><br />
 $values{'title'}<br />
 $values{'owner'} -- $values{'lastrevisiondate'}<br />
@@ -2940,8 +2945,9 @@ END
 ######################################################################
 sub compact_view {
     my ($prefix,%values) = @_;
+    my $icon=&Apache::loncommon::icon($values{'url'});
     my $result=<<END;
-$prefix <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"  target='search_preview'>
+$prefix <img src="$icon" /> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}"  target='search_preview'>
 $values{'title'}</a>
 <b>$values{'author'}</b><br />
 END
@@ -2962,8 +2968,9 @@ END
 ######################################################################
 sub fielded_format_view {
     my ($prefix,%values) = @_;
+    my $icon=&Apache::loncommon::icon($values{'url'});
     my $result=<<END;
-$prefix
+$prefix <img src="$icon" />
 <b>URL: </b> <a href="http://$ENV{'HTTP_HOST'}$values{'url'}" 
               target='search_preview'>$values{'url'}</a>
 <br />
@@ -3183,7 +3190,6 @@ sub start_fresh_session {
 
 sub cleanup {
     if (tied(%groupsearch_db)) {
-	&Apache::lonnet::logthis('Cleanup searchcat: groupsearch_db');
         unless (untie(%groupsearch_db)) {
 	  &Apache::lonnet::logthis('Failed cleanup searchcat: groupsearch_db');
         }