--- loncom/interface/lonsearchcat.pm	2003/09/22 00:48:32	1.186
+++ 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.186 2003/09/22 00:48:32 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";
@@ -441,7 +445,7 @@ sub course_search {
    }
    &untiehash();
     unless ($totalfound) {
-	$r->print('<p>No resources found.</p>');
+	$r->print('<p>'.&mt('No resources found').'.</p>');
     }
 # =================================================== Done going through course
     $r->print('</body></html>');
@@ -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>
@@ -559,41 +564,49 @@ ENDDOCUMENT
     my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});
     my $domain = $r->dir_config('lonDefDomain');
     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'}"
->Advanced Search</a></td></tr>
-<tr><td>$relatedcheckbox use related words</td>
-    <td>$domaincheckbox only search domain <b>$domain</b></td></tr>
+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 $userelatedwords</td>
+    <td>$domaincheckbox $onlysearchdomain <b>$domain</b></td></tr>
 </table>
 </p>
 <p>
-&nbsp;<input type="submit" name="basicsubmit" value='SEARCH' />&nbsp;
+&nbsp;<input type="submit" name="basicsubmit" value='$srch' />&nbsp;
 $closebutton
 END
-    $scrout.=&selectbox(undef,'viewselect',
+    $scrout.=&selectbox('View','viewselect',
 			$ENV{'form.viewselect'},
 			undef,undef,undef,
 			sort(keys(%Views)));
-    $scrout.=&selectbox(undef,'show',
+    $scrout.=&selectbox('Per Page','show',
 			$ENV{'form.show'},
 			undef,undef,undef,
 			(10,20,50,100));
     $scrout.=<<ENDDOCUMENT;
-per page.
 </p>
 </form>
 ENDDOCUMENT
     }
     if ($ENV{'request.course.id'}) {
+	my %lt=&Apache::lonlocal::texthash(
+					   'srch' => 'Search',
+                                           'header' => 'Course Search',
+	 'note' => 'Enter terms or phrases, then press "Search" below',
+					   );
         $scrout.=(<<ENDCOURSESEARCH);
 <hr />
-<h1>Course Search</h1>    
-<form method="post" action="/adm/searchcat">
+<h1>$lt{'header'}</h1>    
+<form name="course_search" method="post" action="/adm/searchcat">
 <input type="hidden" name="phase" value="course_search" />
 $hidden_fields
 <p>
-Enter terms or phrases, then press SEARCH below.
+$lt{'note'}.
 </p>
 <p>
 <table>
@@ -610,7 +623,7 @@ ENDCOURSESEARCH
 <tr><td>$relcheckbox use related words</td><td></td></tr>
 <tr><td>$crscheckbox fulltext search (time consuming)</td><td></td></tr>
 </table><p>
-&nbsp;<input type="submit" name="coursesubmit" value='SEARCH' />
+&nbsp;<input type="submit" name="coursesubmit" value='$lt{'srch'}' />
 </p>
 ENDENDCOURSE
     }
@@ -682,8 +695,8 @@ ENDHEADER
 			undef,undef,undef,
 			(10,20,50,100));
     $scrout.='&nbsp;'.
-        '<font color="#800000" face="helvetica">Per Page</font>';
-    $scrout.="</td><td>Related<br />Words</td></tr>\n";
+        '<font color="#800000" face="helvetica">'.&mt('Per Page').'</font>';
+    $scrout.="</td><td>".&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";
     $scrout.=&searchphrasefield_with_related('title',   'title'   ,
                                              $ENV{'form.title'});
     $scrout.=&searchphrasefield('author',  'author'  ,$ENV{'form.author'});
@@ -1058,7 +1071,7 @@ field heading.
 ###############################################
 
 sub fieldtitle {
-    my $title = uc(shift());
+    my $title = uc(&mt(shift()));
     return '<font color="#800000" face="helvetica"><b>'.$title.
         ':&nbsp;</b></font>';
 }
@@ -1153,7 +1166,7 @@ END
     my $i = 1;
     foreach (qw/January February March April May June 
 	     July August September October November December /){
-	$month .="<option value=\"$i\">$_</option>\n";
+	$month .="<option value=\"$i\">".&mt($_)."</option>\n";
 	$i++;
     }
     $month.="</select>\n";
@@ -1241,12 +1254,12 @@ sub selectbox {
     foreach (@idlist) {
         $selout.='<option value="'.$_.'"';
         if ($_ eq $default and !/^any$/) {
-	    $selout.=' selected >'.&{$functionref}($_).'</option>';
+	    $selout.=' selected >'.&mt(&{$functionref}($_)).'</option>';
 	}
 	elsif ($_ eq $default and /^$anyvalue$/) {
-	    $selout.=' selected >'.$anytag.'</option>';
+	    $selout.=' selected >'.&mt($anytag).'</option>';
 	}
-        else {$selout.='>'.&{$functionref}($_).'</option>';}
+        else {$selout.='>'.&mt(&{$functionref}($_)).'</option>';}
     }
     return $selout.'</select>'.(defined($title)?'</p>':' ');
 }
@@ -1841,8 +1854,8 @@ sub ensure_db_and_table {
 sub print_sort_form {
     my ($r,$pretty_query_string) = @_;
     ##
-    my %SortableFields = 
-        (id        => 'Default',
+    my %SortableFields=&Apache::lonlocal::texthash( 
+         id        => 'Default',
          title     => 'Title',
          author    => 'Author',
          subject   => 'Subject',
@@ -1854,7 +1867,7 @@ sub print_sort_form {
          copyright => 'Copyright',
          hostname  => 'Host',
          creationdate     => 'Creation Date',
-         lastrevisiondate => 'Revision Date',
+         lastrevisiondate => 'Revision Date'
      );
     ##
     my $table = $ENV{'form.table'};
@@ -2108,7 +2121,7 @@ END
     if (@Lines > 2) {
         $pretty_string = join '<br \>',(@Lines[0..2],'....<br />');
     }
-    $r->print("Search: ".$pretty_string);
+    $r->print(&mt("Search").": ".$pretty_string);
     $r->rflush();
     #
     # Determine the servers we need to contact.
@@ -2174,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);
@@ -2186,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); 
         }
@@ -2203,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;
@@ -2263,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
@@ -2408,7 +2421,7 @@ sub display_results {
          );
     if ($total_results == 0) {
         $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
-                  '<h3>There are currently no results.</h3>'.
+                  '<h3>'.&mt('There are currently no results').'.</h3>'.
                   "</form></body></html>");
         return;
     } else {
@@ -2439,7 +2452,7 @@ sub display_results {
         $r->rflush();
     }
     if (@Results < 1) {
-        $r->print("There were no results matching your query");
+        $r->print(&mt("There were no results matching your query"));
     } else {
         $r->print
             ('<center>'.
@@ -2682,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
@@ -2720,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;
@@ -2845,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 />
@@ -2879,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 />
@@ -2905,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
@@ -2927,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 />
@@ -3148,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');
         }