--- loncom/interface/lonsearchcat.pm	2008/08/04 15:28:21	1.297
+++ loncom/interface/lonsearchcat.pm	2008/10/16 22:58:15	1.300
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.297 2008/08/04 15:28:21 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.300 2008/10/16 22:58:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1394,7 +1394,7 @@ sub parse_advanced_search {
 		   'lastrevisiondatestart_month','lastrevisiondatestart_day',
 		   'lastrevisiondatestart_year','lastrevisiondateend_month',
 		   'lastrevisiondateend_day','lastrevisiondateend_year') {
-	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;
+	$env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.\*]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1639,7 +1639,7 @@ sub parse_advanced_search {
     #
     if (@queries) {
         if ($env{'form.area'} eq 'portfolio') {
-            $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND (".join(') AND (',@queries).'))';
+            $query ="SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa, portfolio_addedfields pf WHERE (pm.url = pa.url AND pf.url = pm.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND (".join(') AND (',@queries).'))';
         } else {
 	    $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
         }
@@ -1702,7 +1702,7 @@ sub parse_basic_search {
     #
     # Clean up fields for safety
     for my $field ('basicexp') {
-	$env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-]//g;
+	$env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-\*]//g;
     }
     foreach ('mode','form','element') {
 	# is this required?  Hmmm.
@@ -1741,7 +1741,7 @@ sub parse_basic_search {
     #}
     my $final_query;
     if ($env{'form.area'} eq 'portfolio') {
-        $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa  WHERE (pm.url = pa.url AND (pa.start < NOW() AND (pa.end IS NULL OR pa.end > NOW())) AND '.join(" AND ",@Queries).')';
+        $final_query = 'SELECT pm.*,pa.keynum,pa.scope FROM portfolio_metadata pm, portfolio_access pa  WHERE (pm.url = pa.url AND (pa.start < UTC_TIMESTAMP() AND (pa.end IS NULL OR pa.end > UTC_TIMESTAMP())) AND '.join(" AND ",@Queries).')';
     } else {
         $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
     }
@@ -2489,8 +2489,6 @@ sub run_search {
     $r->print(<<END);
 $start_page
 $breadcrumbs
-<form name="statusform" action="" method="post">
-<input type="hidden" name="acts" value="" />
 END
     # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;
@@ -2501,7 +2499,7 @@ END
         pop(@Lines);
     }
     if (@Lines > 2) {
-        $pretty_string = join '<br />',(@Lines[0..2],'....<br />');
+        $pretty_string = join '<br />',(@Lines[0..2],'...<br />');
     }
     $r->print(&mt("Search: [_1]",$pretty_string));
     $r->rflush();
@@ -2556,21 +2554,22 @@ END
     my $server; 
     my $status;
     my $revise = &revise_button();
-    my $txt_total = &mt('Total Matches');
-    my $txt_remain = &mt('Time Remaining');
-    my $txt_status = &mt('Status');
-    $r->print(<<END);
-<table>
-<tr><th>$txt_status</th><th>$txt_total</th><th>$txt_remain</th><th></th></tr>
-<tr>
-<td><input type="text" name="status"  value="" size="50" /></td>
-<td><input type="text" name="count"   value="" size="10" /></td>
-<td><input type="text" name="seconds" value="" size="8" /></td>
-<td>$revise</td>
-</tr>
-</table>
-</form>
-END
+    $r->print('<form name="statusform" action="" method="post">'."\n".
+              '<input type="hidden" name="acts" value="" />'."\n".
+              '<table border="0"><tr><td>'."\n".
+              &Apache::loncommon::start_data_table());
+    $r->print(&Apache::loncommon::start_data_table_header_row()
+             .'<th>'.&mt('Status').'</th>'
+             .'<th>'.&mt('Total Matches').'</th>'
+             .'<th>'.&mt('Time Remaining').'</th>'
+             .&Apache::loncommon::end_data_table_header_row()
+             .&Apache::loncommon::start_data_table_row()
+             .'<td><input type="text" name="status"  value="" size="50" readonly="readonly" /></td>'
+             .'<td><input type="text" name="count"   value="" size="10" readonly="readonly" /></td>'
+             .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
+             .&Apache::loncommon::end_data_table_row()
+             .&Apache::loncommon::end_data_table()
+             .'</td><td>&nbsp;</td><td>'.$revise.'</td></tr></table></form>');
     $r->rflush();
     &reset_timing();
     &update_seconds($r);