--- loncom/xml/lonxml.pm 2006/03/23 23:48:10 1.402
+++ loncom/xml/lonxml.pm 2006/04/18 20:55:26 1.409
@@ -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.409 2006/04/18 20:55:26 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -162,28 +162,6 @@ sub disable_LaTeX_substitutions {
$Apache::lonxml::substitute_LaTeX_symbols = 0;
}
-sub xmlbegin {
- my ($style)=@_;
- my $output='';
- @htmlareafields=();
- if ($env{'browser.mathml'}) {
- $output=''
- #.''."\n"
-# .'] >'
- .''
- .'';
- } else {
- $output='';
- }
- if ($style eq 'encode') {
- $output=&HTML::Entities::encode($output,'<>&"');
- }
- return $output;
-}
-
sub xmlend {
my ($target,$parser)=@_;
my $mode='xml';
@@ -204,9 +182,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 +282,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 +1471,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 +1544,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 +1565,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);