--- loncom/interface/lonsearchcat.pm 2005/03/16 22:46:24 1.239 +++ loncom/interface/lonsearchcat.pm 2005/03/21 21:01:15 1.240 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.239 2005/03/16 22:46:24 matthew Exp $ +# $Id: lonsearchcat.pm,v 1.240 2005/03/21 21:01:15 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1555,7 +1555,7 @@ sub parse_domain_restrictions { # $ENV{'form.domains'} can be either a scalar or an array reference. # We need an array. if (! exists($ENV{'form.domains'}) || $ENV{'form.domains'} eq '') { - return (undef,''); + return (undef,'',undef); } my @allowed_domains; if (ref($ENV{'form.domains'})) { @@ -1645,7 +1645,9 @@ sub parse_basic_search { return; } push(@Queries,$SQLQuery); - push(@Queries,$domain_sql_restriction); + if (defined($domain_sql_restriction) && $domain_sql_restriction ne '') { + push(@Queries,$domain_sql_restriction); + } #foreach my $q (@Queries) { # &Apache::lonnet::logthis(' '.$q); #} @@ -2444,7 +2446,7 @@ END - +
StatusTotal MatchesTime Remaining
$revise