--- loncom/interface/lonsearchcat.pm 2003/06/16 19:42:02 1.179
+++ loncom/interface/lonsearchcat.pm 2003/06/16 20:54:39 1.180
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Search Catalog
#
-# $Id: lonsearchcat.pm,v 1.179 2003/06/16 19:42:02 www Exp $
+# $Id: lonsearchcat.pm,v 1.180 2003/06/16 20:54:39 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -382,7 +382,8 @@ END
(undef,undef,undef,undef);
my $pretty_string;
if ($ENV{'form.phase'} eq 'basic_search') {
- ($query,$pretty_string) = &parse_basic_search($r,$closebutton);
+ ($query,$pretty_string,$libraries) =
+ &parse_basic_search($r,$closebutton);
} else { # Advanced search
($query,$customquery,$customshow,$libraries,$pretty_string)
= &parse_advanced_search($r,$closebutton);
@@ -554,12 +555,15 @@ then press SEARCH below.
ENDDOCUMENT
$scrout.=' '.&simpletextfield('basicexp',$ENV{'form.basicexp'},40).
' ';
- my $checkbox = &simplecheckbox('related',$ENV{'form.related'});
+ my $relatedcheckbox = &simplecheckbox('related',$ENV{'form.related'});
+ my $domain = $r->dir_config('lonDefDomain');
+ my $domaincheckbox = &simplecheckbox('domains',$domain,'checked');
$scrout.=<Advanced Search
-
+$checkbox use related words $relatedcheckbox use related words
+ $domaincheckbox only search domain $domain
@@ -579,10 +583,10 @@ per page.
ENDDOCUMENT - if ($ENV{'request.course.id'}) { $scrout.='