--- loncom/interface/lonsearchcat.pm	2003/06/17 16:01:30	1.182
+++ loncom/interface/lonsearchcat.pm	2003/11/17 20:53:28	1.192
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.182 2003/06/17 16:01:30 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.192 2003/11/17 20:53:28 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,6 +82,7 @@ use Text::Query;
 use GDBM_File;
 use Apache::loncommon();
 use Apache::lonmysql();
+use Apache::lonlocal;
 
 # ---------------------------------------- variables used throughout the module
 
@@ -186,7 +187,7 @@ sub handler {
                       # This button is different for the RAT compared to
                       # normal invocation.
     #
-    $r->content_type('text/html');
+    &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
     ##
@@ -199,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
@@ -281,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";
@@ -440,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>');
@@ -557,42 +562,48 @@ ENDDOCUMENT
         '&nbsp;';
     my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});
     my $domain = $r->dir_config('lonDefDomain');
-    my $domaincheckbox = &simplecheckbox('domains',$domain,'checked');
+    my $domaincheckbox = &simplecheckbox('domains',$domain);
+    my $srch=&mt('Search');
+    my $header=&mt('Advanced Search');
     $scrout.=<<END;
 </td><td><a
-href="/adm/searchcat?phase=disp_adv&catalogmode=$ENV{'form.catalogmode'}&launch=$ENV{'form.launch'}"
->Advanced Search</a></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 use related words</td>
     <td>$domaincheckbox only search domain <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>    
+<h1>$lt{'header'}</h1>    
 <form 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>
@@ -609,7 +620,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
     }
@@ -681,8 +692,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'});
@@ -1057,7 +1068,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>';
 }
@@ -1152,7 +1163,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";
@@ -1229,6 +1240,7 @@ sub selectbox {
     my ($title,$name,$default,$anyvalue,$anytag,$functionref,@idlist)=@_;
     if (! defined($functionref)) { $functionref = sub { $_[0]}; }
     my $selout='';
+    $title=&mt($title);
     if (defined($title)) {
         my $uctitle=uc($title);
         $selout="\n".'<p><font color="#800000" face="helvetica">'.
@@ -1239,12 +1251,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>':' ');
 }
@@ -1536,7 +1548,9 @@ sub parse_basic_search {
         $pretty_search_string .= ' '.$pretty_domains_string;
     }
     $pretty_search_string .= "<br />\n";
-    return ('SELECT * FROM metadata WHERE '.$query,$pretty_search_string,
+    my $final_query = 'SELECT * FROM metadata WHERE '.$query;
+#    &Apache::lonnet::logthis($final_query);
+    return ($final_query,$pretty_search_string,
             $libraries_to_query);
 }
 
@@ -1837,8 +1851,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',
@@ -1850,7 +1864,7 @@ sub print_sort_form {
          copyright => 'Copyright',
          hostname  => 'Host',
          creationdate     => 'Creation Date',
-         lastrevisiondate => 'Revision Date',
+         lastrevisiondate => 'Revision Date'
      );
     ##
     my $table = $ENV{'form.table'};
@@ -2104,7 +2118,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.
@@ -2170,22 +2184,23 @@ END
         if (@Servers_to_contact) {
             # Contact one server
             my $server = shift(@Servers_to_contact);
+            &update_status($r,&mt('contacting').' '.$server);
             my $reply=&Apache::lonnet::metadata_query($query,$customquery,
                                                       $customshow,[$server]);
             ($server) = keys(%$reply);
             $Server_status{$server} = $reply->{$server};
-            &update_status($r,'contacting '.$server);
         } else {
             # wait a sec. to give time for files to be written
             # This sleep statement is here instead of outside the else 
             # block because we do not want to pause if we have servers
             # left to contact.  
+            if (scalar (keys(%Server_status))) {
+                &update_status($r,
+                       &mt('waiting on').' '.(join(' ',keys(%Server_status))));
+            }
             sleep(1); 
         }
         #
-        if (scalar (keys(%Server_status))) {
-            &update_status($r,'waiting on '.(join(' ',keys(%Server_status))));
-        }
         #
         # Loop through the servers we have contacted but do not
         # have results from yet, looking for results.
@@ -2198,12 +2213,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;
@@ -2258,7 +2273,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
@@ -2403,7 +2418,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 {
@@ -2434,7 +2449,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>'.
@@ -2677,8 +2692,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
@@ -2715,14 +2738,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;
@@ -2738,10 +2778,19 @@ SCRIPT
     $result.=<<SCRIPT if $ENV{'form.catalogmode'} eq 'groupsearch';
 <script type="text/javascript">
     function queue(checkbox_num,val) {
-        if (document.forms.results.returnvalues[checkbox_num].checked) {
-            parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+        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';
+            } else {
+                parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+            }
         } else {
-            parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+            if (document.forms.results.returnvalues.checked) {
+                parent.statusframe.document.forms.statusform.elements.Queue.value +='1a'+val+'b';
+            } else {
+                parent.statusframe.document.forms.statusform.elements.Queue.value +='0a'+val+'b';
+            }
         }
     }
     function select_group() {
@@ -2831,8 +2880,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 />
@@ -2865,8 +2915,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 />
@@ -2891,8 +2942,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
@@ -2913,8 +2965,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 />