--- loncom/interface/lonsearchcat.pm	2003/09/29 15:28:40	1.188
+++ loncom/interface/lonsearchcat.pm	2003/12/16 15:00:56	1.195
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.188 2003/09/29 15:28:40 www Exp $
+# $Id: lonsearchcat.pm,v 1.195 2003/12/16 15:00:56 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -200,7 +200,7 @@ sub handler {
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
              ['catalogmode','launch','acts','mode','form','element','pause',
               'phase','persistent_db_id','table','start','show',
-              'cleargroupsort']);
+              'cleargroupsort','titleelement']);
     ##
     ## 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
@@ -282,6 +282,10 @@ END
         $hidden_fields .= '<input type="hidden" name="element" value="'.
                 $ENV{'form.element'}.'" />'."\n";
     }
+    if (exists($ENV{'form.titleelement'})) {
+        $hidden_fields .= '<input type="hidden" name="titleelement" value="'.
+                $ENV{'form.titleelement'}.'" />'."\n";
+    }
     if (exists($ENV{'form.mode'})) {
         $hidden_fields .= '<input type="hidden" name="mode" value="'.
                 $ENV{'form.mode'}.'" />'."\n";
@@ -541,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>
-<form method="post" action="/adm/searchcat">
+<h1>$CatalogSearch</h1>
+<form name="loncapa_search" 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>
@@ -561,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'}"
+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>
@@ -595,7 +602,7 @@ ENDDOCUMENT
         $scrout.=(<<ENDCOURSESEARCH);
 <hr />
 <h1>$lt{'header'}</h1>    
-<form method="post" action="/adm/searchcat">
+<form name="course_search" method="post" action="/adm/searchcat">
 <input type="hidden" name="phase" value="course_search" />
 $hidden_fields
 <p>
@@ -2038,7 +2045,6 @@ sub update_count_status {
 sub update_status {
     my ($r,$text) = @_;
     $text =~ s/\'/\\\'/g;
-    $text=&mt($text);
     $r->print
         ("<script>document.statusform.status.value = ' $text'</script>\n");
     $r->rflush();
@@ -2181,7 +2187,7 @@ END
         if (@Servers_to_contact) {
             # Contact one server
             my $server = shift(@Servers_to_contact);
-            &update_status($r,'contacting '.$server);
+            &update_status($r,&mt('contacting').' '.$server);
             my $reply=&Apache::lonnet::metadata_query($query,$customquery,
                                                       $customshow,[$server]);
             ($server) = keys(%$reply);
@@ -2193,7 +2199,7 @@ END
             # left to contact.  
             if (scalar (keys(%Server_status))) {
                 &update_status($r,
-                               'waiting on '.(join(' ',keys(%Server_status))));
+                       &mt('waiting on').' '.(join(' ',keys(%Server_status))));
             }
             sleep(1); 
         }
@@ -2210,12 +2216,12 @@ END
             $status=~/^([\.\w]+)$/; 
        	    my $datafile=$r->dir_config('lonDaemons').'/tmp/'.$1;
             if (-e $datafile && ! -e "$datafile.end") {
-                &update_status($r,'Receiving results from '.$server);
+                &update_status($r,&mt('Receiving results from').' '.$server);
                 next;
             }
             last if ($connection->aborted());
             if (-e "$datafile.end") {
-                &update_status($r,'Reading results from '.$server);
+                &update_status($r,&mt('Reading results from').' '.$server);
                 if (-z "$datafile") {
                     delete($Server_status{$server});
                     next;
@@ -2270,7 +2276,7 @@ END
             &update_seconds($r,$time_remaining);
         }
     }
-    &update_status($r,'Search Complete'.$server);
+    &update_status($r,&mt('Search Complete').$server);
     &update_seconds($r,0);
     &Apache::lonmysql::disconnect_from_db();
     # We have run out of time or run out of servers to talk to and
@@ -2689,8 +2695,16 @@ Checked for existance & 'edit' mode.
 
 =item 'form.form'
 
+Contains the name of the form that has the input fields to set
+
 =item 'form.element'
 
+the name of the input field to put the URL into
+
+=item 'form.titleelement'
+
+the name of the input field to put the title into
+
 =back
 
 =cut
@@ -2727,14 +2741,31 @@ SCRIPT
         } elsif ($ENV{'form.mode'} eq 'edit') {
             my $form = $ENV{'form.form'};
             my $element = $ENV{'form.element'};
+            my $titleelement = $ENV{'form.titleelement'};
+	    my $changetitle;
+	    if (!$titleelement) {
+		$changetitle='function changeTitle(val) {}';
+	    } else {
+		    $changetitle=<<END;
+function changeTitle(val) {
+    if (parent.targetwin.document) {
+        parent.targetwin.document.forms["$form"].elements["$titleelement"].value=val;
+    } else {
+	var url = 'forms[\"$form\"].elements[\"$titleelement\"].value';
+        alert("Unable to transfer data to "+url);
+    }
+}
+END
+            }
+
             $result.=<<SCRIPT;
 <script type="text/javascript">
 function select_data(title,url) {
     changeURL(url);
+    changeTitle(title);
     parent.close();
 }
-function changeTitle(val) {
-}
+$changetitle
 function changeURL(val) {
     if (parent.targetwin.document) {
         parent.targetwin.document.forms["$form"].elements["$element"].value=val;
@@ -2852,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 />
@@ -2886,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 />
@@ -2912,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
@@ -2934,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 />
@@ -3155,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');
         }