--- loncom/interface/lonsearchcat.pm 2004/04/19 21:46:50 1.212 +++ loncom/interface/lonsearchcat.pm 2004/04/27 15:45:04 1.218 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.212 2004/04/19 21:46:50 matthew Exp $ +# $Id: lonsearchcat.pm,v 1.218 2004/04/27 15:45:04 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -150,7 +150,8 @@ sub handler { ## Initialize global variables ## my $domain = $r->dir_config('lonDefDomain'); - $diropendb= "/home/httpd/perl/tmp/$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db"; + $diropendb= "/home/httpd/perl/tmp/". + "$ENV{'user.domain'}_$ENV{'user.name'}_searchcat.db"; # # set the name of the persistent database # $ENV{'form.persistent_db_id'} can only have digits in it. @@ -404,8 +405,7 @@ my $totalfound; sub course_search { my $r=shift; - my $bodytag=&Apache::loncommon::bodytag('Course Search'). - &Apache::loncommon::help_open_bug('Searching'); + my $bodytag=&Apache::loncommon::bodytag('Course Search'); my $pretty_search_string = ''.$ENV{'form.courseexp'}.''; my $search_string = $ENV{'form.courseexp'}; my @New_Words; @@ -503,13 +503,6 @@ sub search_html_header {
-$Statement. -
--
-ENDDOCUMENT
- $scrout.=' '.
+ # Define interface components
+ my $userelatedwords=
+ &mt('[_1] use related words',
+ &Apache::lonhtmlcommon::checkbox
+ ('related',$ENV{'form.related'}));
+ my $onlysearchdomain=
+ &mt('[_1] only search domain [_2]',
+ &Apache::lonhtmlcommon::checkbox
+ ('domains',$ENV{'form.domains'}),
+ $r->dir_config('lonDefDomain'));
+ my $adv_search_link =
+ ''.&mt('Advanced Search').'';
+ #
+ $scrout.='
-ENDDOCUMENT
+ $ENV{'form.basicexp'},50).' '. + ''.&searchhelp().''.' | '.
+ ''.
+ ' '. + ' '. + ' '. + ' | '.
+ '
'. +# ''. +# $userelatedwords.(' 'x3). +# $onlysearchdomain.(' 'x2).$adv_search_link. +# ''. +# ' | |
'. + ''. + ''. + (' 'x2).$closebutton.(' 'x2).&viewoptions(). + ''. + ' |
+ my $advanced_buttons=<<"END"; $closebutton - END - my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search'). - &Apache::lonhtmlcommon::breadcrumbs(undef,'Searching', - 'Finding_Resources', - undef,undef, - ! $ENV{'form.launch'}); - my $searchhelp=&searchhelp(); my $scrout=&search_html_header(); $scrout .= <<"ENDHEADER"; $bodytag