--- loncom/interface/lonsearchcat.pm	2004/01/01 20:13:17	1.200
+++ loncom/interface/lonsearchcat.pm	2004/01/02 16:34:03	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.200 2004/01/01 20:13:17 www Exp $
+# $Id: lonsearchcat.pm,v 1.201 2004/01/02 16:34:03 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -485,7 +485,7 @@ $bodytag
 ENDDOCUMENT
 if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) {
     my $CatalogSearch=&mt('Catalog Search');
-    my $Statement=&mt('Enter terms or phrases separated by AND, OR, or NOT then press SEARCH below');
+    my $Statement=&searchhelp();
     $scrout.=(<<ENDDOCUMENT);
 <h1>$CatalogSearch</h1>
 <form name="loncapa_search" method="post" action="/adm/searchcat">
@@ -602,10 +602,8 @@ $closebutton
 <input type="button" value="$lt{'help'}" onClick="openhelp()" />
 </p>
 END
-    if (!defined($ENV{'form.viewselect'})) {
-        $ENV{'form.viewselect'} ="Detailed Citation View";
-    }
     my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search');
+    my $searchhelp=&searchhelp();
     my $scrout=<<"ENDHEADER";
 <html>
 <head>
@@ -619,8 +617,7 @@ END
 </script>
 </head>
 $bodytag
-Enter terms or phrases separated by search operators 
-such as AND, OR, or NOT.<br />
+$searchhelp
 <form method="post" action="/adm/searchcat" name="advsearch">
 $advanced_buttons
 $hidden_fields
@@ -628,22 +625,29 @@ $hidden_fields
 ENDHEADER
     $scrout.=&viewoptions();
     my %fields=&Apache::lonmeta::fieldnames();
-# set undefined to "any"
-    $ENV{'form.language'}='any' unless length($ENV{'form.language'});
-    $ENV{'form.domains'} = 'any' if (! exists($ENV{'form.domains'}));
-    $ENV{'form.category'}='any' if (! defined($ENV{'form.category'}));
-
 
     $scrout.='<table>';
     $scrout.="<tr><th>".&mt('Field').'</th><th>'.&mt('Value').'</th><th>'
 	.&mt('Related').'<br />'.&mt('Words')."</td></tr>\n";
     foreach ('title','author','keywords','notes','abstract','standards',
 	     'lowestgradelevel','highestgradelevel','mime') {
-	$scrout.='<tr><td>'.&titlefield($fields{$_}).'</td><td>'.
+	$scrout.='<tr bgcolor="#FFFFBB"><td>'.&titlefield($fields{$_}).'</td><td>'.
 	    &Apache::lonmeta::prettyinput($_,$ENV{'form.'.$_},$_,'advsearch',
 					  1,'</td><td>',$ENV{'form.'.$_.'_related'}).
 	    '</td></tr>';
     }
+    my %dates=&Apache::lonlocal::texthash('creationdatestart'     => 'Creation Date After',
+				  	  'creationdateend'       => 'Creation Date Before',
+					  'lastrevisiondatestart' => 'Last Revision Date After',
+					  'lastrevisiondateend'   => 'Last Revision Date Before');
+    foreach (sort keys %dates) {
+	$scrout.='<tr><td>'.&titlefield($dates{$_}).'</td><td>'. 
+	    &Apache::lonhtmlcommon::date_setter('advsearch',$_,0,'',1).
+	    '</td><td>&nbsp;</td></td></tr>';
+    }
+    
+
+
     # Hack - an empty table row.
     $scrout.="<tr><td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td></tr>\n";
 #    $scrout.=&searchphrasefield('file<br />extension','extension',
@@ -789,6 +793,25 @@ sub viewoptions {
 }
 
 ######################################################################
+
+=pod 
+
+=item searchhelp
+
+Inputs: none
+
+Outputs: return little blurb on how to enter searches
+
+=cut
+
+######################################################################
+######################################################################
+
+sub searchhelp {
+    return &mt('Enter terms or phrases separated by AND, OR, or NOT');
+}
+
+######################################################################
 ######################################################################
 
 =pod 

".&mt('Field').'	'.&mt('Value').'	' .&mt('Related').' '.&mt('Words')."
'.&titlefield($fields{$_}).'	'. + $scrout.='
'.&titlefield($fields{$_}).'	'. &Apache::lonmeta::prettyinput($_,$ENV{'form.'.$_},$_,'advsearch', 1,'	',$ENV{'form.'.$_.'_related'}). '
'.&titlefield($dates{$_}).'	'. + &Apache::lonhtmlcommon::date_setter('advsearch',$_,0,'',1). + '