--- loncom/interface/lonsearchcat.pm	2003/05/21 14:43:46	1.173
+++ loncom/interface/lonsearchcat.pm	2003/06/16 19:18:00	1.178
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.173 2003/05/21 14:43:46 matthew Exp $
+# $Id: lonsearchcat.pm,v 1.178 2003/06/16 19:18:00 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -214,8 +214,7 @@ sub handler {
     ## Initialize global variables
     ##
     my $domain  = $r->dir_config('lonDefDomain');
-    $diropendb= "/home/httpd/perl/tmp/".&Apache::lonnet::escape($domain).
-            "\_".&Apache::lonnet::escape($ENV{'user.name'})."_searchcat.db";
+    $diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db";
     #
     # set the name of the persistent database
     #          $ENV{'form.persistent_db_id'} can only have digits in it.
@@ -720,7 +719,7 @@ ENDHEADER
     my $size = 4;
     $size = (scalar @domains < ($size - 1) ? scalar @domains + 1 : $size);
     $scrout.="\n".'<font color="#800000" face="helvetica"><b>'.
-        'DOMAINS</b></font><br />'.
+        'DOMAINS TO BE SEARCHED</b></font><br />'.
             '<select name="domains" size="'.$size.'" multiple>'."\n".
                 '<option name="any" value="any" '.
                     ($domain_hash{'any'}? 'selected ' :'').
@@ -1499,13 +1498,13 @@ 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);
     $pretty_search_string .= "<br />\n";
-    return 'select * from metadata where '.$query,$pretty_search_string;
+    return 'SELECT * FROM metadata WHERE '.$query,$pretty_search_string;
 }
 
 
@@ -1622,9 +1621,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') {
@@ -2131,6 +2130,7 @@ 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.