[BACK]Return to lonsearchcat.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonsearchcat.pm between versions 1.298 and 1.300

version 1.298, 2008/08/08 08:51:39 version 1.300, 2008/10/16 22:58:15
Line 1394  sub parse_advanced_search { Line 1394  sub parse_advanced_search {
    'lastrevisiondatestart_month','lastrevisiondatestart_day',     'lastrevisiondatestart_month','lastrevisiondatestart_day',
    'lastrevisiondatestart_year','lastrevisiondateend_month',     'lastrevisiondatestart_year','lastrevisiondateend_month',
    'lastrevisiondateend_day','lastrevisiondateend_year') {     'lastrevisiondateend_day','lastrevisiondateend_year') {
  $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.]//g;   $env{'form.'.$field}=~s/[^\w\/\s\(\)\=\-\"\'.\*]//g;
     }      }
     foreach ('mode','form','element') {      foreach ('mode','form','element') {
  # is this required?  Hmmm.   # is this required?  Hmmm.
Line 1639  sub parse_advanced_search { Line 1639  sub parse_advanced_search {
     #      #
     if (@queries) {      if (@queries) {
         if ($env{'form.area'} eq 'portfolio') {          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 {          } else {
     $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';      $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
         }          }
Line 1702  sub parse_basic_search { Line 1702  sub parse_basic_search {
     #      #
     # Clean up fields for safety      # Clean up fields for safety
     for my $field ('basicexp') {      for my $field ('basicexp') {
  $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-]//g;   $env{"form.$field"}=~s/[^\w\s\'\"\!\(\)\-\*]//g;
     }      }
     foreach ('mode','form','element') {      foreach ('mode','form','element') {
  # is this required?  Hmmm.   # is this required?  Hmmm.
Line 1741  sub parse_basic_search { Line 1741  sub parse_basic_search {
     #}      #}
     my $final_query;      my $final_query;
     if ($env{'form.area'} eq 'portfolio') {      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 {      } else {
         $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);          $final_query = 'SELECT * FROM metadata WHERE '.join(" AND ",@Queries);
     }      }
Line 2489  sub run_search { Line 2489  sub run_search {
     $r->print(<<END);      $r->print(<<END);
 $start_page  $start_page
 $breadcrumbs  $breadcrumbs
 <form name="statusform" action="" method="post">  
 <input type="hidden" name="acts" value="" />  
 END  END
     # Remove leading and trailing <br />      # Remove leading and trailing <br />
     $pretty_string =~ s:^\s*<br />::i;      $pretty_string =~ s:^\s*<br />::i;
Line 2556  END Line 2554  END
     my $server;       my $server; 
     my $status;      my $status;
     my $revise = &revise_button();      my $revise = &revise_button();
     $r->print(&Apache::loncommon::start_data_table());      $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()      $r->print(&Apache::loncommon::start_data_table_header_row()
              .'<th>'.&mt('Status').'</th>'               .'<th>'.&mt('Status').'</th>'
              .'<th>'.&mt('Total Matches').'</th>'               .'<th>'.&mt('Total Matches').'</th>'
              .'<th>'.&mt('Time Remaining').'</th>'               .'<th>'.&mt('Time Remaining').'</th>'
 #             .'<th>&nbsp;</th>'               .&Apache::loncommon::end_data_table_header_row()
              .&Apache::loncommon::end_data_table_header_row());               .&Apache::loncommon::start_data_table_row()
     $r->print(&Apache::loncommon::start_data_table_row()  
              .'<td><input type="text" name="status"  value="" size="50" readonly="readonly" /></td>'               .'<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="count"   value="" size="10" readonly="readonly" /></td>'
              .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'               .'<td><input type="text" name="seconds" value="" size="8" readonly="readonly" /></td>'
 #             ."<td>$revise</td>"               .&Apache::loncommon::end_data_table_row()
              .&Apache::loncommon::end_data_table_row());               .&Apache::loncommon::end_data_table()
     $r->print(&Apache::loncommon::start_data_table());               .'</td><td>&nbsp;</td><td>'.$revise.'</td></tr></table></form>');
     $r->print($revise  
              .'</form>');  
     $r->rflush();      $r->rflush();
     &reset_timing();      &reset_timing();
     &update_seconds($r);      &update_seconds($r);
Removed from v.1.298  
changed lines
  Added in v.1.300

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>