--- loncom/interface/lonsearchcat.pm	2003/06/14 00:15:01	1.177
+++ loncom/interface/lonsearchcat.pm	2003/09/28 00:14:25	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.177 2003/06/14 00:15:01 albertel Exp $
+# $Id: lonsearchcat.pm,v 1.187 2003/09/28 00:14:25 www 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;
     ##
@@ -207,7 +208,7 @@ sub handler {
     ##     this once, so the pause indicator is deleted
     ##
     if (exists($ENV{'form.pause'})) {
-        sleep(3);
+        sleep(1);
         delete($ENV{'form.pause'});
     }
     ##
@@ -382,7 +383,8 @@ END
             (undef,undef,undef,undef);
         my $pretty_string;
         if ($ENV{'form.phase'} eq 'basic_search') {
-            ($query,$pretty_string) = &parse_basic_search($r,$closebutton);
+            ($query,$pretty_string,$libraries) = 
+                &parse_basic_search($r,$closebutton);
         } else {                      # Advanced search
             ($query,$customquery,$customshow,$libraries,$pretty_string) 
                 = &parse_advanced_search($r,$closebutton);
@@ -439,7 +441,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>');
@@ -554,58 +556,70 @@ then press SEARCH below.
 ENDDOCUMENT
     $scrout.='&nbsp;'.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
         '&nbsp;';
-    my $checkbox = &simplecheckbox('related',$ENV{'form.related'});
+    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');
     $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>$checkbox use related words</td><td></td></tr>
+>$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'}) { $scrout.='<hr />'; }
-}
-if ($ENV{'request.course.id'}) {
-    $scrout.=(<<ENDCOURSESEARCH);
-<h1>Course Search</h1>    
+    }
+    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>$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>
 <tr><td>
 ENDCOURSESEARCH
-    $scrout.='&nbsp;'.&simpletextfield('courseexp',$ENV{'form.courseexp'},40);
-    my $crscheckbox = &simplecheckbox('crsfulltext',$ENV{'form.crsfulltext'});
-    my $relcheckbox = &simplecheckbox('crsrelated',$ENV{'form.crsrelated'});
-$scrout.=(<<ENDENDCOURSE);
+        $scrout.='&nbsp;'.
+            &simpletextfield('courseexp',$ENV{'form.courseexp'},40);
+        my $crscheckbox = 
+            &simplecheckbox('crsfulltext',$ENV{'form.crsfulltext'});
+        my $relcheckbox = 
+            &simplecheckbox('crsrelated',$ENV{'form.crsrelated'});
+        $scrout.=(<<ENDENDCOURSE);
 </td></tr>
 <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
-}
+    }
     $scrout.=(<<ENDDOCUMENT);
 </body>
 </html>
@@ -674,8 +688,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'});
@@ -845,6 +859,13 @@ sub get_persistent_form_data {
     # Loop through the keys, looking for 'form.'
     foreach my $name (keys(%persistent_db)) {
         next if ($name !~ /^form./);
+        # Kludgification begins!
+        if ($name eq 'form.domains' && 
+            $ENV{'form.searchmode'} eq 'basic' &&
+            $ENV{'form.phase'} ne 'disp_basic') {
+            next;
+        }
+        # End kludge (hopefully)
         next if (exists($ENV{$name}));
         my @values = map { 
             &Apache::lonnet::unescape($_);
@@ -859,6 +880,7 @@ sub get_persistent_form_data {
     untie (%persistent_db);
     return 1;
 }
+
 ######################################################################
 ######################################################################
 
@@ -1017,11 +1039,11 @@ If $value eq 'on' the box is checked.
 ###############################################
 ###############################################
 
-sub simplecheckbox {
-    my ($name,$value)=@_;
-    my $checked='';
-    $checked="checked" if $value eq 'on';
-    return '<input type="checkbox" name="'.$name.'" '. $checked . ' />';
+sub simplecheckbox{
+    my ($name,$value,$checked)=@_;
+    $checked="checked" if ($value eq 'on');
+    return '<input type="checkbox" name="'.$name.'" value="'.$value.'" '.
+        $checked.' />';
 }
 
 ###############################################
@@ -1042,7 +1064,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>';
 }
@@ -1137,7 +1159,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";
@@ -1214,6 +1236,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">'.
@@ -1224,12 +1247,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>':' ');
 }
@@ -1415,11 +1438,33 @@ sub parse_advanced_search {
     ## ---------------------------------------------------------------
     ## Deal with restrictions to given domains
     ## 
+    my ($libraries_to_query,$pretty_domains_string) = 
+        &parse_domain_restrictions();
+    $pretty_search_string .= $pretty_domains_string."<br />\n";
+    #
+    if (@queries) {
+	$query=join(" AND ",@queries);
+	$query="select * from metadata where $query";
+    } elsif ($customquery) {
+        $query = '';
+    }
+    return ($query,$customquery,$customshow,$libraries_to_query,
+            $pretty_search_string);
+}
+
+sub parse_domain_restrictions {
     my $libraries_to_query = undef;
     # $ENV{'form.domains'} can be either a scalar or an array reference.
     # We need an array.
-    my @allowed_domains = (ref($ENV{'form.domains'}) ? @{$ENV{'form.domains'}} 
-                           :  ($ENV{'form.domains'}) );
+    if (! exists($ENV{'form.domains'})) {
+        return (undef,'');
+    }
+    my @allowed_domains;
+    if (ref($ENV{'form.domains'})) {
+        @allowed_domains =  @{$ENV{'form.domains'}};
+    } else {
+        @allowed_domains = ($ENV{'form.domains'});
+    }
     my %domain_hash = ();
     my $pretty_domains_string;
     foreach (@allowed_domains) {
@@ -1442,16 +1487,7 @@ sub parse_advanced_search {
             }
         }
     }
-    $pretty_search_string .= $pretty_domains_string."<br />\n";
-    #
-    if (@queries) {
-	$query=join(" AND ",@queries);
-	$query="select * from metadata where $query";
-    } elsif ($customquery) {
-        $query = '';
-    }
-    return ($query,$customquery,$customshow,$libraries_to_query,
-            $pretty_search_string);
+    return ($libraries_to_query,$pretty_domains_string);
 }
 
 ######################################################################
@@ -1479,7 +1515,8 @@ sub parse_basic_search {
 	$ENV{"form.$_"}=&Apache::lonnet::unescape($ENV{"form.$_"});
 	$ENV{"form.$_"}=~s/[^\w\/\s\(\)\=\-\"\']//g;
     }
-
+    my ($libraries_to_query,$pretty_domains_string) = 
+        &parse_domain_restrictions();
     # Check to see if enough is filled in
     unless (&filled($ENV{'form.basicexp'})) {
 	&output_blank_field_error($r,$closebutton,'phase=disp_basic');
@@ -1498,13 +1535,19 @@ sub parse_basic_search {
     }
     # Build SQL query string based on form page
     my $query='';
-    my $concatarg=join(',"    ",',
+    my $concatarg=join(',',
 		       ('title', 'author', 'subject', 'notes', 'abstract',
                         'keywords'));
     $concatarg='title' if $ENV{'form.titleonly'};
-    $query=&build_SQL_query('concat('.$concatarg.')',$search_string);
+    $query=&build_SQL_query('concat_ws(" ",'.$concatarg.')',$search_string);
+    if (defined($pretty_domains_string) && $pretty_domains_string ne '') {
+        $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);
 }
 
 
@@ -1621,9 +1664,9 @@ sub recursive_SQL_query_build {
         my ($key,$value)=($1,$2);
         my $replacement='';
         if ($key eq 'literal') {
-            $replacement="($dkey like \"\%$value\%\")";
-        } elsif ($key eq 'not') {
-            $value=~s/like/not like/;
+            $replacement="($dkey LIKE \"\%$value\%\")";
+        } elsif (lc($key) eq 'not') {
+            $value=~s/LIKE/NOT LIKE/;
 #          $replacement="($dkey not like $value)";
             $replacement="$value";
         } elsif ($key eq 'and') {
@@ -1804,8 +1847,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',
@@ -1817,7 +1860,7 @@ sub print_sort_form {
          copyright => 'Copyright',
          hostname  => 'Host',
          creationdate     => 'Creation Date',
-         lastrevisiondate => 'Revision Date',
+         lastrevisiondate => 'Revision Date'
      );
     ##
     my $table = $ENV{'form.table'};
@@ -1995,6 +2038,7 @@ 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();
@@ -2071,7 +2115,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.
@@ -2130,28 +2174,30 @@ END
     my $time_remaining = $max_time - (time - $starttime) ;
     my $last_time = $time_remaining;
     &update_seconds($r,$time_remaining);
+    &update_status($r,'contacting '.$Servers_to_contact[0]);
     while (($time_remaining > 0) &&
            ((@Servers_to_contact) || keys(%Server_status))) {
         # Send out a search request if it needs to be done.
         if (@Servers_to_contact) {
             # Contact one server
             my $server = shift(@Servers_to_contact);
+            &update_status($r,'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,
+                               '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.
@@ -2368,7 +2414,8 @@ sub display_results {
          ."</center>\n"
          );
     if ($total_results == 0) {
-        $r->print("There are currently no results.\n".
+        $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="1">'.
+                  '<h3>'.&mt('There are currently no results').'.</h3>'.
                   "</form></body></html>");
         return;
     } else {
@@ -2399,7 +2446,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>'.
@@ -2703,10 +2750,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() {