loncom/xml/lonxml.pm - diff

Return to lonxml.pm CVS log

Up to [LON-CAPA] / loncom / xml

Diff for /loncom/xml/lonxml.pm between versions 1.375 and 1.398

version 1.375, 2005/06/09 02:12:26	version 1.398, 2006/03/08 21:49:26
Line 52 use Math::Random();	Line 52 use Math::Random();
use Opcode();	use Opcode();
use POSIX qw(strftime);	use POSIX qw(strftime);
use Time::HiRes qw( gettimeofday tv_interval );	use Time::HiRes qw( gettimeofday tv_interval );
	use Symbol();

sub register {	sub register {
my ($space,@taglist) = @_;	my ($space,@taglist) = @_;
Line 148 $Apache::lonxml::post_evaluate=1;	Line 149 $Apache::lonxml::post_evaluate=1;
#a header message to emit in the case of any generated warning or errors	#a header message to emit in the case of any generated warning or errors
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';

	# Control whether or not LaTeX symbols should be substituted for their
	# \ style equivalents...this may be turned off e.g. in an verbatim
	# environment.

	$Apache::lonxml::substitute_LaTeX_symbols = 1; # Starts out on.

	sub enable_LaTeX_substitutions {
	$Apache::lonxml::substitute_LaTeX_symbols = 1;
	}
	sub disable_LaTeX_substitutions {
	$Apache::lonxml::substitute_LaTeX_symbols = 0;
	}

sub xmlbegin {	sub xmlbegin {
my ($style)=@_;	my ($style)=@_;
my $output='';	my $output='';
Line 180 sub xmlend {	Line 194 sub xmlend {
$status=$Apache::inputtags::status[-1];	$status=$Apache::inputtags::status[-1];
}	}
my $discussion;	my $discussion;
&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
($env{'query_string'},['LONCAPA_INTERNAL_no_discussion']);	['LONCAPA_INTERNAL_no_discussion']);
if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) \|\|	if (! exists($env{'form.LONCAPA_INTERNAL_no_discussion'}) \|\|
$env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {	$env{'form.LONCAPA_INTERNAL_no_discussion'} ne 'true') {
$discussion=&Apache::lonfeedback::list_discussion($mode,$status);	$discussion=&Apache::lonfeedback::list_discussion($mode,$status);
Line 272 sub printtokenheader {	Line 286 sub printtokenheader {
$tcrsid=$courseid;	$tcrsid=$courseid;
}	}

my %reply=&Apache::lonnet::get('environment',	my $plainname=&Apache::loncommon::plainname($tuname,$tudom);
['firstname','middlename','lastname','generation'],
$tudom,$tuname);
my $plainname=$reply{'firstname'}.' '.
$reply{'middlename'}.' '.
$reply{'lastname'}.' '.
$reply{'generation'};

if ($target eq 'web') {	if ($target eq 'web') {
my %idhash=&Apache::lonnet::idrget($tudom,($tuname));	my %idhash=&Apache::lonnet::idrget($tudom,($tuname));
Line 369 sub xmlparse {	Line 377 sub xmlparse {
&initdepth();	&initdepth();
&init_alarm();	&init_alarm();
my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,	my $finaloutput = &inner_xmlparse($target,\@stack,\@parstack,\@pars,
$safeeval,\%style_for_target);	$safeeval,\%style_for_target,1);

if ($env{'request.uri'}) {	if ($env{'request.uri'}) {
&writeallows($env{'request.uri'});	&writeallows($env{'request.uri'});
}	}
&do_registered_ssi();	&do_registered_ssi();
if ($Apache::lonxml::counter_changed) { &store_counter() }	if ($Apache::lonxml::counter_changed) { &store_counter() }

	&clean_safespace($safeeval);

if ($env{'form.return_only_error_and_warning_counts'}) {	if ($env{'form.return_only_error_and_warning_counts'}) {
return "$errorcount:$warningcount";	return "$errorcount:$warningcount";
}	}
Line 384 sub xmlparse {	Line 395 sub xmlparse {

sub latex_special_symbols {	sub latex_special_symbols {
my ($string,$where)=@_;	my ($string,$where)=@_;
	#
	# If e.g. in verbatim mode, then don't substitute.
	# but return original string.
	#
	if (!($Apache::lonxml::substitute_LaTeX_symbols)) {
	return $string;
	}
if ($where eq 'header') {	if ($where eq 'header') {
$string =~ s/(\\\|_\|\^)/ /g;	$string =~ s/(\\\|_\|\^)/ /g;
$string =~ s/(\$\|%\|\{\|\})/\\$1/g;	$string =~ s/(\$\|%\|\{\|\})/\\$1/g;
Line 397 sub latex_special_symbols {	Line 415 sub latex_special_symbols {
$string=~s/\\\%\|\%/\\\%/g;	$string=~s/\\\%\|\%/\\\%/g;
$string=~s/\\{\|{/\\{/g;	$string=~s/\\{\|{/\\{/g;
$string=~s/\\}\|}/\\}/g;	$string=~s/\\}\|}/\\}/g;
	$string=~s/\\ensuremath\\{\\backslash\\}/\\ensuremath{\\backslash}/g;
$string=~s/\\\$\|\$/\\\$/g;	$string=~s/\\\$\|\$/\\\$/g;
$string=~s/\\\_\|\_/\\\_/g;	$string=~s/\\\_\|\_/\\\_/g;
$string=~s/([^\\]\|^)(\~\|\^)/$1\\$2\\strut /g;	$string=~s/([^\\]\|^)(\~\|\^)/$1\\$2\\strut /g;
Line 412 sub latex_special_symbols {	Line 431 sub latex_special_symbols {
}	}

sub inner_xmlparse {	sub inner_xmlparse {
my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target)=@_;	my ($target,$stack,$parstack,$pars,$safeeval,$style_for_target,$start)=@_;
my $finaloutput = '';	my $finaloutput = '';
my $result;	my $result;
my $token;	my $token;
my $dontpop=0;	my $dontpop=0;
	my $startredirection = $Apache::lonxml::redirection;
while ( $#$pars > -1 ) {	while ( $#$pars > -1 ) {
while ($token = $$pars['-1']->get_token) {	while ($token = $$pars['-1']->get_token) {
if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') ) {	if (($token->[0] eq 'T') \|\| ($token->[0] eq 'C') ) {
Line 526 sub inner_xmlparse {	Line 546 sub inner_xmlparse {
# $finaloutput.=&endredirection;	# $finaloutput.=&endredirection;
# }	# }

	if ( $start && $target eq 'grade') { &endredirection(); }
	if ( $Apache::lonxml::redirection > $startredirection) {
	while ($Apache::lonxml::redirection > $startredirection) {
	$finaloutput .= &endredirection();
	}
	}
if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {	if (($ENV{'QUERY_STRING'}) && ($target eq 'web')) {
$finaloutput=&afterburn($finaloutput);	$finaloutput=&afterburn($finaloutput);
}	}
Line 624 sub setup_globals {	Line 649 sub setup_globals {
@Apache::lonxml::ssi_info=();	@Apache::lonxml::ssi_info=();
$Apache::lonxml::post_evaluate=1;	$Apache::lonxml::post_evaluate=1;
$Apache::lonxml::warnings_error_header='';	$Apache::lonxml::warnings_error_header='';
	$Apache::lonxml::substitute_LaTeX_symbols = 1;
if ($target eq 'meta') {	if ($target eq 'meta') {
$Apache::lonxml::redirection = 0;	$Apache::lonxml::redirection = 0;
$Apache::lonxml::metamode = 1;	$Apache::lonxml::metamode = 1;
Line 635 sub setup_globals {	Line 661 sub setup_globals {
$Apache::lonxml::evaluate = 1;	$Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;	$Apache::lonxml::import = 1;
} elsif ($target eq 'grade') {	} elsif ($target eq 'grade') {
&startredirection;	&startredirection(); #ended in inner_xmlparse on exit
$Apache::lonxml::metamode = 0;	$Apache::lonxml::metamode = 0;
$Apache::lonxml::evaluate = 1;	$Apache::lonxml::evaluate = 1;
$Apache::lonxml::import = 1;	$Apache::lonxml::import = 1;
Line 664 sub setup_globals {	Line 690 sub setup_globals {

sub init_safespace {	sub init_safespace {
my ($target,$safeeval,$safehole,$safeinit) = @_;	my ($target,$safeeval,$safehole,$safeinit) = @_;
	$safeeval->deny_only(':dangerous');
	$safeeval->reval('use Math::Complex;');
	$safeeval->permit_only(":default");
$safeeval->permit("entereval");	$safeeval->permit("entereval");
$safeeval->permit(":base_math");	$safeeval->permit(":base_math");
$safeeval->permit("sort");	$safeeval->permit("sort");
Line 721 sub init_safespace {	Line 750 sub init_safespace {
$safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );	$safehole->wrap(\&Math::Cephes::stdtr ,$safeeval,'&stdtr' );
$safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');	$safehole->wrap(\&Math::Cephes::stdtri,$safeeval,'&stdtri');

	$safehole->wrap(\&Math::Cephes::Matrix::mat,$safeeval,'&mat');
	$safehole->wrap(\&Math::Cephes::Matrix::new,$safeeval,
	'&Math::Cephes::Matrix::new');
	$safehole->wrap(\&Math::Cephes::Matrix::coef,$safeeval,
	'&Math::Cephes::Matrix::coef');
	$safehole->wrap(\&Math::Cephes::Matrix::clr,$safeeval,
	'&Math::Cephes::Matrix::clr');
	$safehole->wrap(\&Math::Cephes::Matrix::add,$safeeval,
	'&Math::Cephes::Matrix::add');
	$safehole->wrap(\&Math::Cephes::Matrix::sub,$safeeval,
	'&Math::Cephes::Matrix::sub');
	$safehole->wrap(\&Math::Cephes::Matrix::mul,$safeeval,
	'&Math::Cephes::Matrix::mul');
	$safehole->wrap(\&Math::Cephes::Matrix::div,$safeeval,
	'&Math::Cephes::Matrix::div');
	$safehole->wrap(\&Math::Cephes::Matrix::inv,$safeeval,
	'&Math::Cephes::Matrix::inv');
	$safehole->wrap(\&Math::Cephes::Matrix::transp,$safeeval,
	'&Math::Cephes::Matrix::transp');
	$safehole->wrap(\&Math::Cephes::Matrix::simq,$safeeval,
	'&Math::Cephes::Matrix::simq');
	$safehole->wrap(\&Math::Cephes::Matrix::mat_to_vec,$safeeval,
	'&Math::Cephes::Matrix::mat_to_vec');
	$safehole->wrap(\&Math::Cephes::Matrix::vec_to_mat,$safeeval,
	'&Math::Cephes::Matrix::vec_to_mat');
	$safehole->wrap(\&Math::Cephes::Matrix::check,$safeeval,
	'&Math::Cephes::Matrix::check');
	$safehole->wrap(\&Math::Cephes::Matrix::check,$safeeval,
	'&Math::Cephes::Matrix::check');

# $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');	# $safehole->wrap(\&Math::Cephes::new_fract,$safeeval,'&new_fract');
# $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');	# $safehole->wrap(\&Math::Cephes::radd,$safeeval,'&radd');
# $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');	# $safehole->wrap(\&Math::Cephes::rsub,$safeeval,'&rsub');
Line 761 sub init_safespace {	Line 820 sub init_safespace {
&initialize_rndseed($safeeval);	&initialize_rndseed($safeeval);
}	}

	sub clean_safespace {
	my ($safeeval) = @_;
	delete_package_recurse($safeeval->{Root});
	}

	sub delete_package_recurse {
	my ($package) = @_;
	my @subp;
	{
	no strict 'refs';
	while (my ($key,$val) = each(%{*{"$package\::"}})) {
	if (!defined($val)) { next; }
	local (*ENTRY) = $val;
	if (defined *ENTRY{HASH} && $key =~ /::$/ &&
	$key ne "main::" && $key ne "<none>::")
	{
	my ($p) = $package ne "main" ? "$package\::" : "";
	($p .= $key) =~ s/::$//;
	push(@subp,$p);
	}
	}
	}
	foreach my $p (@subp) {
	delete_package_recurse($p);
	}
	Symbol::delete_package($package);
	}

sub initialize_rndseed {	sub initialize_rndseed {
my ($safeeval)=@_;	my ($safeeval)=@_;
my $rndseed;	my $rndseed;
Line 817 sub startredirection {	Line 904 sub startredirection {

sub endredirection {	sub endredirection {
if (!$Apache::lonxml::redirection) {	if (!$Apache::lonxml::redirection) {
&Apache::lonxml::error("Endredirection was called, before a startredirection, perhaps you have unbalanced tags. Some debuging information:".join ":",caller);	&Apache::lonxml::error("Endredirection was called before a startredirection, perhaps you have unbalanced tags. Some debugging information:".join ":",caller);
return '';	return '';
}	}
$Apache::lonxml::redirection--;	$Apache::lonxml::redirection--;
Line 892 sub get_all_text_unbalanced {	Line 979 sub get_all_text_unbalanced {
$tag='<'.$tag.'>';	$tag='<'.$tag.'>';
while ($token = $$pars[-1]->get_token) {	while ($token = $$pars[-1]->get_token) {
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {
$result.=$token->[1];	if ($token->[0] eq 'T' && $token->[2]) {
	$result.='<![CDATA['.$token->[1].']]>';
	} else {
	$result.=$token->[1];
	}
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
$result.=$token->[2];	$result.=$token->[2];
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
Line 923 sub increment_counter {	Line 1014 sub increment_counter {
}	}

sub init_counter {	sub init_counter {
if (defined($env{'form.counter'})) {	if ($env{'request.state'} eq 'construct') {
	$Apache::lonxml::counter=1;
	$Apache::lonxml::counter_changed=1;
	} elsif (defined($env{'form.counter'})) {
$Apache::lonxml::counter=$env{'form.counter'};	$Apache::lonxml::counter=$env{'form.counter'};
$Apache::lonxml::counter_changed=0;	$Apache::lonxml::counter_changed=0;
} else {	} else {
Line 937 sub store_counter {	Line 1031 sub store_counter {
return '';	return '';
}	}

	{
	my $state;
	sub clear_problem_counter {
	&Apache::lonnet::logthis(" cpc called from ".(join(':',caller(0))));
	undef($state);
	&Apache::lonnet::delenv('form.counter');
	&Apache::lonxml::init_counter();
	&Apache::lonxml::store_counter();
	}

	sub remember_problem_counter {
	&Apache::lonnet::transfer_profile_to_env();
	$state = $env{'form.counter'};
	}

	sub restore_problem_counter {
	if (defined($state)) {
	&Apache::lonnet::appenv(('form.counter' => $state));
	}
	}
	}

sub get_all_text {	sub get_all_text {
my($tag,$pars,$style)= @_;	my($tag,$pars,$style)= @_;
my $gotfullstack=1;	my $gotfullstack=1;
Line 958 sub get_all_text {	Line 1074 sub get_all_text {
while (($depth >=0) && ($token = $$pars[-1]->get_token)) {	while (($depth >=0) && ($token = $$pars[-1]->get_token)) {
#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);	#&Apache::lonxml::debug("e token:$token->[0]:$depth:$token->[1]:".$#$pars.":".$#Apache::lonxml::pwd);
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|($token->[0] eq 'D')) {
$result.=$token->[1];	if ($token->[2]) {
	$result.='<![CDATA['.$token->[1].']]>';
	} else {
	$result.=$token->[1];
	}
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
$result.=$token->[2];	$result.=$token->[2];
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
Line 1010 sub get_all_text {	Line 1130 sub get_all_text {
#&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");	#&Apache::lonxml::debug("s token:$token->[0]:$depth:$token->[1]");
if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|	if (($token->[0] eq 'T')\|\|($token->[0] eq 'C')\|\|
($token->[0] eq 'D')) {	($token->[0] eq 'D')) {
$result.=$token->[1];	if ($token->[2]) {
	$result.='<![CDATA['.$token->[1].']]>';
	} else {
	$result.=$token->[1];
	}
} elsif ($token->[0] eq 'PI') {	} elsif ($token->[0] eq 'PI') {
$result.=$token->[2];	$result.=$token->[2];
} elsif ($token->[0] eq 'S') {	} elsif ($token->[0] eq 'S') {
Line 1063 sub parstring {	Line 1187 sub parstring {
return $temp;	return $temp;
}	}

	sub extlink {
	my ($res,$exact)=@_;
	if (!$exact) {
	$res=&Apache::lonnet::hreflocation($Apache::lonxml::pwd[-1],$res);
	}
	push(@Apache::lonxml::extlinks,$res)
	}

sub writeallows {	sub writeallows {
unless ($#extlinks>=0) { return; }	unless ($#extlinks>=0) { return; }
my $thisurl='/res/'.&Apache::lonnet::declutter(shift);	my $thisurl = &Apache::lonnet::clutter(shift);
if ($env{'httpref.'.$thisurl}) {	if ($env{'httpref.'.$thisurl}) {
$thisurl=$env{'httpref.'.$thisurl};	$thisurl=$env{'httpref.'.$thisurl};
}	}
Line 1147 sub createnewhtml {	Line 1279 sub createnewhtml {
my $title=&mt('Title of document goes here');	my $title=&mt('Title of document goes here');
my $body=&mt('Body of document goes here');	my $body=&mt('Body of document goes here');
my $filecontents=(<<SIMPLECONTENT);	my $filecontents=(<<SIMPLECONTENT);
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml/11/DTD/xhtml11.dtd">
<html>	<html>
<head>	<head>
<title>$title</title>	<title>$title</title>
Line 1336 ENDNOTFOUND	Line 1467 ENDNOTFOUND
} else {	} else {
unless ($env{'request.state'} eq 'published') {	unless ($env{'request.state'} eq 'published') {
if ($filecontents=~/BEGIN LON-CAPA Internal/) {	if ($filecontents=~/BEGIN LON-CAPA Internal/) {
&Apache::lonxml::error(&mt('This file appears to be a rendering of a Lon-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'));	&Apache::lonxml::error(&mt('This file appears to be a rendering of a LON-CAPA resource. If this is correct, this resource will act very oddly and incorrectly.'));
}	}
#	#
# we are in construction space, see if edit mode forced	# we are in construction space, see if edit mode forced
&Apache::loncommon::get_unprocessed_cgi	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
($ENV{'QUERY_STRING'},['editmode']);	['editmode']);
}	}
if (!$env{'form.editmode'} \|\| $env{'form.viewmode'}) {	if (!$env{'form.editmode'} \|\| $env{'form.viewmode'}) {
$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,	$result = &Apache::lonxml::xmlparse($request,$target,$filecontents,
'',%mystyle);	'',%mystyle);
undef($Apache::lonhomework::parsing_a_task);	undef($Apache::lonhomework::parsing_a_task);
	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
	['rawmode']);
	if ($env{'form.rawmode'}) { $result = $filecontents; }
}	}
}	}

Line 1394 sub debug {	Line 1528 sub debug {
if ($Apache::lonxml::debug eq "1") {	if ($Apache::lonxml::debug eq "1") {
$\|=1;	$\|=1;
my $request=$Apache::lonxml::request;	my $request=$Apache::lonxml::request;
if (!$request) { $request=Apache->request; }	if (!$request) {
	eval { $request=Apache->request; };
	}
	if (!$request) {
	eval { $request=Apache2::RequestUtil->request; };
	}
$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n");	$request->print('<font size="-2"><pre>DEBUG:'.&HTML::Entities::encode($_[0],'<>&"')."</pre></font>\n");
#&Apache::lonnet::logthis($_[0]);	#&Apache::lonnet::logthis($_[0]);
}	}
Line 1431 sub error {	Line 1570 sub error {
&Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_));	&Apache::lonmsg::author_res_msg($env{'request.filename'},join('<br />',@_));
#notify course	#notify course
if ( $symb && $env{'request.course.id'} ) {	if ( $symb && $env{'request.course.id'} ) {
	my $cnum=$env{'course.'.$env{'request.course.id'}.'.num'};
	my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);	my (undef,%users)=&Apache::lonfeedback::decide_receiver(undef,0,1,1,1);
my $declutter=&Apache::lonnet::declutter($env{'request.filename'});	my $declutter=&Apache::lonnet::declutter($env{'request.filename'});
my @userlist;	my @userlist;
foreach (keys %users) {	foreach (keys %users) {
my ($user,$domain) = split(/:/, $_);	my ($user,$domain) = split(/:/, $_);
push(@userlist,"$user\@$domain");	push(@userlist,"$user\@$domain");
&Apache::lonmsg::user_normal_msg($user,$domain,	my $key=$declutter.'_'.$user.'_'.$domain;
	my %lastnotified=&Apache::lonnet::get('nohist_xmlerrornotifications',
	[$key],
	$cdom,$cnum);
	my $now=time;
	if ($now-$lastnotified{$key}>86400) {
	&Apache::lonmsg::user_normal_msg($user,$domain,
"Error [$declutter]",join('<br />',@_));	"Error [$declutter]",join('<br />',@_));
	&Apache::lonnet::put('nohist_xmlerrornotifications',
	{$key => $now},
	$cdom,$cnum);
	}
}	}
if ($env{'request.role.adv'}) {	if ($env{'request.role.adv'}) {
$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));	$errormsg=&mt("An error occured while processing this resource. The course personnel ([_1]) and the author have been notified.",join(', ',@userlist));

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.375
changed lines
	Added in v.1.398