--- loncom/interface/lonsearchcat.pm 2005/11/29 20:37:06 1.249
+++ loncom/interface/lonsearchcat.pm 2006/02/05 20:56:57 1.251
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.249 2005/11/29 20:37:06 www Exp $
+# $Id: lonsearchcat.pm,v 1.251 2006/02/05 20:56:57 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1542,8 +1542,10 @@ sub parse_advanced_search {
##
my ($libraries_to_query,$pretty_domains_string,$domain_sql_restriction) =
&parse_domain_restrictions();
- push(@queries,$domain_sql_restriction);
- $pretty_search_string .= $pretty_domains_string."
\n";
+ if ((defined($domain_sql_restriction)) && ($domain_sql_restriction ne '')) {
+ push(@queries,$domain_sql_restriction);
+ $pretty_search_string .= $pretty_domains_string."
\n";
+ }
#
if (@queries) {
$query="SELECT * FROM metadata WHERE (".join(") AND (",@queries).')';
@@ -2291,7 +2293,7 @@ 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 $last_time = 0;