--- loncom/xml/lonxml.pm 2004/03/02 20:59:24 1.304 +++ loncom/xml/lonxml.pm 2004/03/02 21:31:22 1.305 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # XML Parser Module # -# $Id: lonxml.pm,v 1.304 2004/03/02 20:59:24 matthew Exp $ +# $Id: lonxml.pm,v 1.305 2004/03/02 21:31:22 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -750,6 +750,7 @@ sub init_safespace { $safehole->wrap(\&Math::Random::random_set_seed_from_phrase,$safeeval,'&random_set_seed_from_phrase'); $safehole->wrap(\&Math::Random::random_get_seed,$safeeval,'&random_get_seed'); $safehole->wrap(\&Math::Random::random_set_seed,$safeeval,'&random_set_seed'); + $safehole->wrap(\&Apache::lonxml::error,$safeeval,'&LONCAPA_INTERNAL_ERROR'); #need to inspect this class of ops # $safeeval->deny(":base_orig"); @@ -768,7 +769,7 @@ sub __LC_INTERNAL_EVALUATE__ { my $__LC__msg; while(1){ { - use strict; + #use strict; if (eval(defined(eval($__LC__a.$__LC__b)))) { return $__LC__msg.$__LC__prefix.eval($__LC__a.$__LC__b.$__LC__c); } @@ -1332,7 +1333,7 @@ sub error { if (($Apache::lonxml::debug eq 1) || ($ENV{'request.state'} eq 'construct') ) { # If printing in construction space, put the error inside

       $request->print($Apache::lonxml::warnings_error_header.
-		      "ERROR:".join("\n",@_)."\n");
+		      "ERROR:".join("
\n",@_)."
\n"); $Apache::lonxml::warnings_error_header=''; } else { $request->print("An Error occured while processing this resource. The instructor has been notified.
");