--- loncom/interface/lonsearchcat.pm 2015/03/12 03:04:45 1.331.4.11 +++ loncom/interface/lonsearchcat.pm 2013/12/31 01:07:28 1.340 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Search Catalog # -# $Id: lonsearchcat.pm,v 1.331.4.11 2015/03/12 03:04:45 raeburn Exp $ +# $Id: lonsearchcat.pm,v 1.340 2013/12/31 01:07:28 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -170,7 +170,7 @@ sub handler { &Apache::lonhtmlcommon::clear_breadcrumbs(); my @allowed_searches = ('portfolio'); - if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') { + if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) { push(@allowed_searches,'res'); } my $crumb_text = 'Portfolio Search'; @@ -193,15 +193,12 @@ sub handler { &Apache::lonnet::logthis('lonsearchcat:'. 'Unable to recover data from '. $persistent_db_file); - my $msg = - &mt('We were unable to retrieve data describing your search.'). - ' '.&mt('This is a serious error and has been logged.'). - '
'. - &mt('Please alert your LON-CAPA administrator.'); - &Apache::loncommon::simple_error_page( - $r,'Search Error', - $msg, - {'no_auto_mt_msg' => 1}); + my $msg = + 'We were unable to retrieve data describing your search. '. + 'This is a serious error and has been logged. '. + 'Please alert your LON-CAPA administrator.'; + &Apache::loncommon::simple_error_page($r,'Search Error', + $msg); return OK; } } @@ -432,7 +429,7 @@ sub hidden_field { =pod =over 4 - + =item &print_basic_search_form() Prints the form for the basic search. Sorry the name is so cryptic. @@ -449,7 +446,7 @@ sub print_basic_search_form { $env{'form.catalogmode'} ne 'import'); my $scrout = &Apache::loncommon::start_page('Content Library').$bread_crumb; # Search form for resource space - if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'}) eq 'F') { + if (&Apache::lonnet::allowed('bre',$env{'request.role.domain'})) { $scrout .= &setup_basic_search($r,'res',$hidden_fields,$closebutton); $scrout .= '

'; } @@ -3800,7 +3797,7 @@ Cleans the global %groupsearch_db by rem ###################################################################### sub start_fresh_session { delete $groupsearch_db{'mode_catalog'}; - foreach (keys(%groupsearch_db)) { + foreach (keys %groupsearch_db) { if ($_ =~ /^pre_/) { delete $groupsearch_db{$_}; }