--- loncom/interface/lonsearchcat.pm	2003/03/10 14:20:07	1.169
+++ loncom/interface/lonsearchcat.pm	2003/05/21 14:43:46	1.173
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.169 2003/03/10 14:20:07 www Exp $
+# $Id: lonsearchcat.pm,v 1.173 2003/05/21 14:43:46 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1618,30 +1618,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 ($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);
 }
@@ -1898,37 +1894,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'},
       #--------------------------------------------------
       );
 
@@ -1956,9 +1946,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;
@@ -2484,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'});