--- loncom/interface/lonsearchcat.pm	2003/03/08 03:24:58	1.168
+++ loncom/interface/lonsearchcat.pm	2003/06/16 19:42:02	1.179
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.168 2003/03/08 03:24:58 www Exp $
+# $Id: lonsearchcat.pm,v 1.179 2003/06/16 19:42:02 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -142,9 +142,13 @@ my %persistent_db;
 my $hidden_fields;
 my $bodytag;
 
+#
+# For course search
+#
 my %alreadyseen;
 my $hashtied;
 my %hash;
+my $totalfound;
  
 ######################################################################
 ######################################################################
@@ -210,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.
@@ -418,6 +421,7 @@ sub course_search {
     }
     my $fulltext=$ENV{'form.crsfulltext'};
     my @allwords=($search_string,@New_Words);
+    $totalfound=0;
     $r->print('<html><head><title>LON-CAPA Course Search</title></head>'.
 	      $bodytag.$pretty_search_string);
     $r->rflush();
@@ -425,13 +429,18 @@ sub course_search {
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
+    my $c=$r->connection;
    &tiehash();
    foreach (keys %hash) {
+       if ($c->aborted()) { last; }
        if (($_=~/^src\_(.+)$/) && (!$alreadyseen{$hash{$_}})) {
            &checkonthis($r,$hash{$_},0,$hash{'title_'.$1},$fulltext,@allwords);
        }
    }
    &untiehash();
+    unless ($totalfound) {
+	$r->print('<p>No resources found.</p>');
+    }
 # =================================================== Done going through course
     $r->print('</body></html>');
 }
@@ -482,9 +491,12 @@ sub checkonthis {
            $r->print('&nbsp;');
        }
        $r->print('<a href="'.$url.'" target="cat">'.
-		 ($title?$title:$url).'</a>');
-       $r->rflush();
+		 ($title?$title:$url).'</a><br />');
+       $totalfound++;
+    } elsif ($fulltext) {
+       $r->print(' .');
     }
+    $r->rflush();
 # Check also the dependencies of this one
     my $dependencies=
                 &Apache::lonnet::metadata($url,'dependencies');
@@ -707,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 ' :'').
@@ -1486,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;
 }
 
 
@@ -1605,30 +1617,26 @@ sub recursive_SQL_query_build {
     my @matches=($pattern=~/(\[[^\]|\[]*\])/g);
     return $pattern unless @matches;
     foreach my $match (@matches) {
-	$match=~/\[ (\w+)\s(.*) \]/;
-	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 not like $value)";
-	    $replacement="$value";
-	}
-	elsif ($key eq 'and') {
-	    $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
-	    $replacement="($1 AND $2)";
-	}
-	elsif ($key eq 'or') {
-	    $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
-	    $replacement="($1 OR $2)";
+        $match=~/\[ (\w+)\s(.*) \]/;
+        my ($key,$value)=($1,$2);
+        my $replacement='';
+        if ($key eq 'literal') {
+            $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') {
+            $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
+            $replacement="($1 AND $2)";
+	} elsif ($key eq 'or') {
+            $value=~/(.*[\"|\)]) ([|\(|\^].*)/;
+            $replacement="($1 OR $2)";
 	}
 	substr($pattern,
-	       index($pattern,$match),
-	       length($match),
-	       $replacement
-	       );
+               index($pattern,$match),
+               length($match),
+               $replacement);
     }
     &recursive_SQL_query_build($dkey,$pattern);
 }
@@ -1885,37 +1893,31 @@ the following format:
 
 =cut
 
-##
-## Restrictions:
-##    columns of type 'text' and 'blob' cannot have defaults.
-##    columns of type 'enum' cannot be used for FULLTEXT.
-##
-my @DataOrder = qw/id title author subject url keywords version notes
-    abstract mime lang owner copyright creationdate lastrevisiondate hostname/;
-
-my %Datatypes = 
-    ( id        =>{ type         => 'MEDIUMINT',
-                    restrictions => 'UNSIGNED NOT NULL',
-                    primary_key  => 'yes',
-                    auto_inc     => 'yes'
-                    },
-      title     =>{ type=>'TEXT'},
-      author    =>{ type=>'TEXT'},
-      subject   =>{ type=>'TEXT'},
-      url       =>{ type=>'TEXT',
-                    restrictions => 'NOT NULL' },
-      keywords  =>{ type=>'TEXT'},
-      version   =>{ type=>'TEXT'},
-      notes     =>{ type=>'TEXT'},
-      abstract  =>{ type=>'TEXT'},
-      mime      =>{ type=>'TEXT'},
-      lang      =>{ type=>'TEXT'},
-      owner     =>{ type=>'TEXT'},
-      copyright =>{ type=>'TEXT'},
-      hostname  =>{ type=>'TEXT'},
+#####################################################################
+#####################################################################
+
+my @Datatypes = 
+    ( { name => 'id', 
+        type => 'MEDIUMINT',
+        restrictions => 'UNSIGNED NOT NULL',
+        primary_key  => 'yes',
+        auto_inc     => 'yes' },
+      { name => 'title',     type=>'TEXT'},
+      { name => 'author',    type=>'TEXT'},
+      { name => 'subject',   type=>'TEXT'},
+      { name => 'url',       type=>'TEXT', restrictions => 'NOT NULL' },
+      { name => 'keywords',  type=>'TEXT'},
+      { name => 'version',   type=>'TEXT'},
+      { name => 'notes',     type=>'TEXT'},
+      { name => 'abstract',  type=>'TEXT'},
+      { name => 'mime',      type=>'TEXT'},
+      { name => 'lang',      type=>'TEXT'},
+      { name => 'owner',     type=>'TEXT'},
+      { name => 'copyright', type=>'TEXT'},
+      { name => 'hostname',  type=>'TEXT'},
       #--------------------------------------------------
-      creationdate     =>{ type=>'DATETIME'},
-      lastrevisiondate =>{ type=>'DATETIME'},
+      { name => 'creationdate',     type=>'DATETIME'},
+      { name => 'lastrevisiondate', type=>'DATETIME'},
       #--------------------------------------------------
       );
 
@@ -1943,9 +1945,8 @@ Returns: the identifier of the table on
 ######################################################################
 sub create_results_table {
     my $table = &Apache::lonmysql::create_table
-        ( { columns => \%Datatypes,
-            column_order => \@DataOrder,
-            fullindex => \@Fullindicies,
+        ( { columns => \@Datatypes,
+            FULLTEXT => [{'columns' => \@Fullindicies},],
         } );
     if (defined($table)) {
         $ENV{'form.table'} = $table;
@@ -2129,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.
@@ -2367,7 +2369,7 @@ sub display_results {
          ."</center>\n"
          );
     if ($total_results == 0) {
-        $r->print("There are currently no results.\n".
+        $r->print("<h3>There are currently no results.</h3>Please try to reload this page, which will update the display.\n".
                   "</form></body></html>");
         return;
     } else {
@@ -2471,7 +2473,7 @@ sub parse_row {
     my @Row = @_;
     my %Fields;
     for (my $i=0;$i<=$#Row;$i++) {
-        $Fields{$DataOrder[$i]}=&Apache::lonnet::unescape($Row[$i]);
+        $Fields{$Datatypes[$i]->{'name'}}=&Apache::lonnet::unescape($Row[$i]);
     }
     $Fields{'language'} = 
         &Apache::loncommon::languagedescription($Fields{'lang'});
