--- loncom/interface/lonsearchcat.pm 2004/04/14 18:29:32 1.206 +++ loncom/interface/lonsearchcat.pm 2004/04/19 13:51:36 1.207 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.206 2004/04/14 18:29:32 matthew Exp $ +# $Id: lonsearchcat.pm,v 1.207 2004/04/19 13:51:36 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -454,6 +454,23 @@ sub untiehash { } # End of course search scoping +sub search_html_header { + my $Str = < + +The LearningOnline Network with CAPA + + +ENDHEADER + return $Str; +} + ###################################################################### ###################################################################### @@ -472,24 +489,11 @@ sub print_basic_search_form { my $bodytag=&Apache::loncommon::bodytag('Search'). &Apache::loncommon::help_open_topic('Finding_Resources'). &Apache::loncommon::help_open_bug('Searching'); - my $scrout=<<"ENDDOCUMENT"; - - -The LearningOnline Network with CAPA - - -$bodytag -ENDDOCUMENT -if (&Apache::lonnet::allowed('bre',$ENV{'request.role.domain'})) { - my $CatalogSearch=&mt('Catalog Search'); - my $Statement=&searchhelp(); - $scrout.=(<$CatalogSearch
@@ -501,20 +505,23 @@ $Statement. @@ -606,18 +613,8 @@ $closebutton END my $bodytag=&Apache::loncommon::bodytag('Advanced Catalog Search'); my $searchhelp=&searchhelp(); - my $scrout=<<"ENDHEADER"; - - -The LearningOnline Network with CAPA - - + my $scrout=&search_html_header(); + $scrout .= <<"ENDHEADER"; $bodytag $searchhelp @@ -634,17 +631,17 @@ ENDHEADER foreach ('title','author','owner','authorspace','modifyinguser', 'keywords','notes','abstract','standards', 'lowestgradelevel','highestgradelevel','mime') { - $scrout.=''; } - $scrout.=''; - $scrout.=''. + $scrout.=''. ''. @@ -735,7 +732,7 @@ Outputs: text for box with view options ###################################################################### ###################################################################### sub viewoptions { - my $scrout="\n\n".'
ENDDOCUMENT - $scrout.=' '.&Apache::lonhtmlcommon::textbox('basicexp', - $ENV{'form.basicexp'},40). - ' '; - my $relatedcheckbox = &Apache::lonhtmlcommon::checkbox('related', - $ENV{'form.related'}); - my $domain = $r->dir_config('lonDefDomain'); - my $domaincheckbox = &Apache::lonhtmlcommon::checkbox('domains', - $ENV{'form.domains'}); - my $srch=&mt('Search'); - my $header=&mt('Advanced Search'); - my $userelatedwords=&mt('use related words'); - my $onlysearchdomain=&mt('only search domain'); - my $view=&viewoptions(); - $scrout.=<dir_config('lonDefDomain'); + my $domaincheckbox = + &Apache::lonhtmlcommon::checkbox('domains', + $ENV{'form.domains'}); + my $srch=&mt('Search'); + my $header=&mt('Advanced Search'); + my $userelatedwords=&mt('use related words'); + my $onlysearchdomain=&mt('only search domain'); + my $view=&viewoptions(); + $scrout.=<$header
'.&titlefield($fields{$_}).''. + $scrout.='
'.&titlefield($fields{$_}).''. &Apache::lonmeta::prettyinput($_,$ENV{'form.'.$_},$_,'advsearch', 1,'',$ENV{'form.'.$_.'_related'}). '
'. + $scrout.='
'. &titlefield(&mt('MIME Type Category')).''. &Apache::loncommon::filecategoryselect('category', $ENV{'form.category'}). ' 
'. + $scrout.='
'. &titlefield(&mt('Limit Search to Domains')).''. &Apache::loncommon::domain_select('domains', $ENV{'form.domains'},1). @@ -655,7 +652,7 @@ ENDHEADER 'lastrevisiondatestart' => 'Last Revision Date After', 'lastrevisiondateend' => 'Last Revision Date Before'); foreach (sort keys %dates) { - $scrout.='
'.&titlefield($dates{$_}).''. &Apache::lonhtmlcommon::date_setter('advsearch',$_,0,'',1). ' 
'. + my $scrout="\n\n".'
'. '
'.&mt('View Options').''. &mt('Records per Page').'
'; unless ($ENV{'form.viewselect'}) { $ENV{'form.viewselect'}='detailed'; }