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

Diff for /loncom/interface/lonsearchcat.pm between versions 1.248 and 1.253

version 1.248, 2005/11/29 20:25:44 version 1.253, 2006/02/08 16:25:39
Line 1542  sub parse_advanced_search { Line 1542  sub parse_advanced_search {
     ##       ## 
     my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) =       my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) = 
         &parse_domain_restrictions();          &parse_domain_restrictions();
     push(@queries,$domain_sql_restriction);      if ((defined($domain_sql_restriction)) && ($domain_sql_restriction ne '')) {
     $pretty_search_string .= $pretty_domains_string."<br />\n";         $pretty_search_string .= $pretty_domains_string."<br />\n";
       }
     #      #
     if (@queries) {      if (@queries) {
  $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';   $query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
Line 1645  sub parse_basic_search { Line 1646  sub parse_basic_search {
         return;          return;
     }      }
     push(@Queries,$SQLQuery);      push(@Queries,$SQLQuery);
     if (defined($domain_sql_restriction) && $domain_sql_restriction ne '') {  
         push(@Queries,$domain_sql_restriction);  
     }  
     #foreach my $q (@Queries) {      #foreach my $q (@Queries) {
     #    &Apache::lonnet::logthis('    '.$q);      #    &Apache::lonnet::logthis('    '.$q);
     #}      #}
Line 2291  sub update_status { Line 2289  sub update_status {
 }  }
   
 {  {
     my $max_time  = 40;  # seconds for the search to complete      my $max_time  = 300;  # seconds for the search to complete
     my $start_time = 0;      my $start_time = 0;
     my $last_time = 0;      my $last_time = 0;
   
Line 2790  sub display_results { Line 2788  sub display_results {
         exists($sort_fields{$env{'form.sortfield'}})) {          exists($sort_fields{$env{'form.sortfield'}})) {
         $sort_command = $env{'form.sortfield'}.' IS NOT NULL '.          $sort_command = $env{'form.sortfield'}.' IS NOT NULL '.
             'ORDER BY '.$env{'form.sortfield'}.' '.$order.              'ORDER BY '.$env{'form.sortfield'}.' '.$order.
             '  LIMIT '.($min-1).','.($max-$min);              '  LIMIT '.($min-1).','.($max-$min+1);
     }      }
     my @Results = &Apache::lonmysql::get_rows($table,$sort_command);      my @Results = &Apache::lonmysql::get_rows($table,$sort_command);
     ##      ##
Line 3737  sub cleanup { Line 3735  sub cleanup {
     }      }
     &untiehash();      &untiehash();
     &Apache::lonmysql::disconnect_from_db();      &Apache::lonmysql::disconnect_from_db();
       return OK;
 }  }
   
 __END__  __END__
Removed from v.1.248  
changed lines
  Added in v.1.253

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