--- loncom/xml/lonxml.pm 2007/01/08 18:45:31 1.430.2.3 +++ loncom/xml/lonxml.pm 2006/12/19 14:24:07 1.431 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.430.2.3 2007/01/08 18:45:31 albertel Exp $ +# $Id: lonxml.pm,v 1.431 2006/12/19 14:24:07 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -88,6 +88,7 @@ use Apache::loncommon(); use Apache::lonfeedback(); use Apache::lonmsg(); use Apache::loncacc(); +use Apache::lonmaxima(); use Apache::lonlocal; #================================================== Main subroutine: xmlparse @@ -674,6 +675,8 @@ sub init_safespace { '&chem_standard_order'); $safehole->wrap(\&Apache::response::check_status,$safeeval,'&check_status'); + $safehole->wrap(\&Apache::lonmaxima::maxima_eval,$safeeval,'&maxima_eval'); + $safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin'); $safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos'); $safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan'); @@ -1457,6 +1460,7 @@ ENDNOTFOUND &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['editmode']); } + &Apache::lonnet::logthis("edit mode is ".$env{'form.editmode'}); if (!$env{'form.editmode'} || $env{'form.viewmode'} || $env{'form.discardview'}) { $result = &Apache::lonxml::xmlparse($request,$target,$filecontents, '',%mystyle); @@ -1562,7 +1566,6 @@ sub error { my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'}; my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1); my $declutter=&Apache::lonnet::declutter($env{'request.filename'}); - my $baseurl = &Apache::lonnet::clutter($declutter); my @userlist; foreach (keys %users) { my ($user,$domain) = split(/:/, $_); @@ -1573,11 +1576,8 @@ sub error { $cdom,$cnum); my $now=time; if ($now-$lastnotified{$key}>86400) { - my $title = &Apache::lonnet::gettitle($symb); - my $sentmessage; &Apache::lonmsg::user_normal_msg($user,$domain, - "Error [$title]",$msg,'',$baseurl,'','', - \$sentmessage,$symb,$title,1); + "Error [$declutter]",$msg); &Apache::lonnet::put('nohist_xmlerrornotifications', {$key => $now}, $cdom,$cnum);