--- loncom/xml/lonxml.pm 2006/03/23 23:48:10 1.402 +++ loncom/xml/lonxml.pm 2006/04/18 20:50:45 1.408 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.402 2006/03/23 23:48:10 albertel Exp $ +# $Id: lonxml.pm,v 1.408 2006/04/18 20:50:45 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -204,9 +204,9 @@ sub xmlend { $discussion.='\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}\end{document}'; &Apache::lonxml::newparser($parser,\$discussion,''); return ''; - } else { - return $discussion.&Apache::loncommon::endbodytag(); } + + return $discussion; } sub tokeninputfield { @@ -304,18 +304,6 @@ sub printtokenheader { } } -sub fontsettings { - my $headerstring=''; - if (($env{'browser.os'} eq 'mac') && (!$env{'browser.mathml'})) { - $headerstring.= - ''; - } elsif (!$env{'browser.mathml'} && $env{'browser.unicode'}) { - $headerstring.= - ''; - } - return $headerstring; -} - sub printalltags { my $temp; foreach $temp (sort keys %Apache::lonxml::alltags) { @@ -1505,7 +1493,6 @@ ENDNOTFOUND my %options = (); if ($env{'environment.remote'} ne 'off') { $options{'bgcolor'} = '#FFFFFF'; - $options{'only_body'} = 1; } my $start_page = &Apache::loncommon::start_page(undef,undef, \%options); @@ -1579,9 +1566,10 @@ sub error { if ( !$symb ) { #public or browsers $errormsg=&mt("An error occured while processing this resource. The author has been notified."); - } + } + my $msg = join('
',@_); #notify author - &Apache::lonmsg::author_res_msg($env{'request.filename'},join('
',@_)); + &Apache::lonmsg::author_res_msg($env{'request.filename'},$msg); #notify course if ( $symb && $env{'request.course.id'} ) { my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'}; @@ -1599,7 +1587,7 @@ sub error { my $now=time; if ($now-$lastnotified{$key}>86400) { &Apache::lonmsg::user_normal_msg($user,$domain, - "Error [$declutter]",join('
',@_)); + "Error [$declutter]",$msg); &Apache::lonnet::put('nohist_xmlerrornotifications', {$key => $now}, $cdom,$cnum);