--- loncom/interface/lonsimplepage.pm 2006/03/16 21:30:00 1.33 +++ loncom/interface/lonsimplepage.pm 2006/03/21 21:07:31 1.34 @@ -1,7 +1,7 @@ # The LearningOnline Network # Simple Page Editor # -# $Id: lonsimplepage.pm,v 1.33 2006/03/16 21:30:00 raeburn Exp $ +# $Id: lonsimplepage.pm,v 1.34 2006/03/21 21:07:31 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -38,15 +38,6 @@ use Apache::lonlocal; use Apache::lonprintout; use Apache::lonxml; -sub error { - my ($r,$msg) = @_; - $r->print(&Apache::loncommon::endheadtag(). - &Apache::loncommon::bodytag(). - &mt($msg). - &Apache::loncommon::end_page()); - return OK; -} - sub handler { my $r = shift; &Apache::loncommon::content_type($r,'text/html'); @@ -54,17 +45,15 @@ sub handler { return OK if $r->header_only; my $target=$env{'form.grade_target'}; # ------------------------------------------------------------ Print the screen - if ($target ne 'tex') { - $r->print(&Apache::lonxml::xmlbegin(). - &Apache::loncommon::headtag()); - } else { + if ($target eq 'tex') { $r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'})); } my (undef,undef,undef,undef,$marker,$caller)=split(/\//,$r->uri); # Is this even in a course? unless ($env{'request.course.id'}) { if ($target ne 'tex') { - return &error($r,'Not in a course'); + return &Apache::loncommon::simple_error_page($r,'', + 'Not in a course'); } else { $r->print('\textbf{Not in a course}\end{document}'); } @@ -83,16 +72,18 @@ sub handler { $namespace = 'grppage_'.$marker; my %curr_groups; if (!&Apache::loncommon::coursegroups(\%curr_groups,$dom,$crs,$marker)) { - return &error($r,'Invalid group name'); + return &Apache::loncommon::simple_error_page($r,'', + 'Invalid group name'); } - %groupinfo = &Apache::loncommon::get_group_settings($curr_groups{$marker}); + %groupinfo = + &Apache::loncommon::get_group_settings($curr_groups{$marker}); } else { $marker=~s/\D//g; $namespace = 'smppage_'.$marker; } if (!$marker) { - return &error($r,'Invalid call'); + return &Apache::loncommon::simple_error_page($r,'','Invalid call'); } # --------------------------------------------------------- The syllabus fields