--- loncom/interface/lonsearchcat.pm	2001/03/15 21:38:52	1.38
+++ loncom/interface/lonsearchcat.pm	2001/03/19 16:45:38	1.41
@@ -3,6 +3,30 @@
 #
 # 03/08/2001 Scott Harrison
 #
+# Functions
+#
+# handler(server reference) : interacts with the Apache server layer
+#                             (for /adm/searchcat URLs)
+# simpletextfield(name,value) : returns HTML formatted string for simple text
+#                               field
+# simplecheckbox(name,value) : returns HTML formatted string for simple
+#                              checkbox
+# searchphrasefield(title,name,value) : returns HTML formatted string for
+#                                       a search expression phrase field
+# dateboxes(name, defaultmonth, defaultday, defaultyear) : returns HTML
+#                                                          formatted string
+#                                                          for a calendar date
+# selectbox(title,name,value,%HASH=options) : returns HTML formatted string for
+#                                             a selection box field
+# advancedsearch() : 
+# filled(field) : determines whether a given field has been filled
+# basicsearch() : 
+# output_blank_field_error() : outputs a message saying that more fields need
+#                              to be filled in
+# output_results() : outputs results from search
+# build_SQL_query() : builds a SQL query string from a logical expression
+#                     with AND/OR keywords
+
 package Apache::lonsearchcat;
 
 use strict;
@@ -10,6 +34,7 @@ use Apache::Constants qw(:common);
 use Apache::lonnet();
 use Apache::File();
 use CGI qw(:standard);
+use Text::Query;
 
 my %language;
 my $scrout;
@@ -232,12 +257,6 @@ ENDDOCUMENT
 
 # --------------------------------------------------------- Various form fields
 
-sub textfield {
-    my ($title,$name,$value)=@_;
-    return "\n<p><b>$title:</b><br>".
-           '<input type=text name="'.$name.'" size=80 value="'.$value.'">';
-}
-
 sub simpletextfield {
     my ($name,$value)=@_;
     return '<input type=text name="'.$name.'" size=20 value="'.$value.'">';
@@ -428,7 +447,7 @@ sub advancedsearch {
     for my $field ('title','author','subject','keywords','url','version',
 		   'notes','abstract','mime','language','owner',
 		   'custommetadata') {
-	if (&filled($ENV{'form.basicexp'})) {
+	if (&filled($ENV{"form.$field"})) {
 	    $fillflag++;
 	}
     }
@@ -437,6 +456,14 @@ sub advancedsearch {
 	&output_blank_field_error($r);
 	return OK;
     }
+
+    my $query='';
+#    my $concatarg=join(',"    ",',
+#		       ('title', 'author', 'subject', 'notes', 'abstract'));
+
+    $query="select * from metadata where concat(title) like '\%$ENV{'form.title'}\%'";
+    my $reply=&Apache::lonnet::metadata_query($query);
+
     &output_results($r,$envhash,$reply);
     return OK;
 }
@@ -462,7 +489,7 @@ sub basicsearch {
 	return OK;
     }
 
-    my $query=$ENV{'form.basicexp'};
+    my $query='';
     my $concatarg=join(',"    ",',
 		       ('title', 'author', 'subject', 'notes', 'abstract'));
 
@@ -644,5 +671,10 @@ RESULTS
     }
 }
 
+# ------------------------------------------------------------- build_SQL_query
+sub build_SQL_query {
+
+}
+
 1;
 __END__