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.78 and 1.84

version 1.78, 2001/05/26 15:31:33	version 1.84, 2001/06/02 03:59:59
Line 8	Line 8
# 3/29,5/4 Gerd Kortemeyer	# 3/29,5/4 Gerd Kortemeyer
# 5/10 Scott Harrison	# 5/10 Scott Harrison
# 5/26 Gerd Kortemeyer	# 5/26 Gerd Kortemeyer
	# 5/27 H. K. Ng

package Apache::lonxml;	package Apache::lonxml;
use vars	use vars
Line 16 use strict;	Line 17 use strict;
use HTML::TokeParser;	use HTML::TokeParser;
use Safe;	use Safe;
use Safe::Hole;	use Safe::Hole;
	use Math::Cephes qw(:trigs :hypers :bessels erf erfc);
use Opcode;	use Opcode;

sub register {	sub register {
Line 35 use Apache::run;	Line 37 use Apache::run;
use Apache::londefdef;	use Apache::londefdef;
use Apache::scripttag;	use Apache::scripttag;
use Apache::edit;	use Apache::edit;
	use Apache::lonnet;
	use Apache::File;

#================================================== Main subroutine: xmlparse	#================================================== Main subroutine: xmlparse
#debugging control, to turn on debugging modify the correct handler	#debugging control, to turn on debugging modify the correct handler
$Apache::lonxml::debug=0;	$Apache::lonxml::debug=0;
Line 167 sub xmlparse {	Line 172 sub xmlparse {

my $safeeval = new Safe;	my $safeeval = new Safe;
my $safehole = new Safe::Hole;	my $safehole = new Safe::Hole;
$safeeval->permit("entereval");	&init_safespace($target,$safeeval,$safehole,$safeinit);
$safeeval->permit(":base_math");
$safeeval->permit("sort");
$safeeval->deny(":base_io");
$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');
#need to inspect this class of ops
# $safeeval->deny(":base_orig");
$safeinit .= ';$external::target='.$target.';';
$safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
&Apache::run::run($safeinit,$safeeval);
#-------------------- Redefinition of the target in the case of compound target	#-------------------- Redefinition of the target in the case of compound target

($target, my @tenta) = split('&&',$target);	($target, my @tenta) = split('&&',$target);
Line 207 sub xmlparse {	Line 203 sub xmlparse {
$safeeval,\%style_for_target,@parstack);	$safeeval,\%style_for_target,@parstack);
}	}
} else {	} else {
$result = &callsub("start_$token->[1]", $target, $token,\@parstack,	$result = &callsub("start_$token->[1]", $target, $token, \@stack,
\@pars, $safeeval, \%style_for_target);	\@parstack, \@pars, $safeeval, \%style_for_target);
}	}
} elsif ($token->[0] eq 'E') {	} elsif ($token->[0] eq 'E') {
#clear out any tags that didn't end	#clear out any tags that didn't end
Line 229 sub xmlparse {	Line 225 sub xmlparse {
}	}

} else {	} else {
$result = &callsub("end_$token->[1]", $target, $token, \@parstack,	$result = &callsub("end_$token->[1]", $target, $token, \@stack,
\@pars,$safeeval, \%style_for_target);	\@parstack, \@pars,$safeeval, \%style_for_target);
}	}
} else {	} else {
&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");	&Apache::lonxml::error("Unknown token event :$token->[0]:$token->[1]:");
Line 291 sub recurse {	Line 287 sub recurse {
push (@innerstack,$tokenpat->[1]);	push (@innerstack,$tokenpat->[1]);
push (@innerparstack,&parstring($tokenpat));	push (@innerparstack,&parstring($tokenpat));
&increasedepth($tokenpat);	&increasedepth($tokenpat);
$partstring = &callsub("start_$tokenpat->[1]",	$partstring = &callsub("start_$tokenpat->[1]", $target, $tokenpat,
$target, $tokenpat, \@innerparstack,	\@innerstack, \@innerparstack, \@pat,
\@pat, $safeeval, $style_for_target);	$safeeval, $style_for_target);
} elsif ($tokenpat->[0] eq 'E') {	} elsif ($tokenpat->[0] eq 'E') {
#clear out any tags that didn't end	#clear out any tags that didn't end
while ($tokenpat->[1] ne $innerstack[$#innerstack]	while ($tokenpat->[1] ne $innerstack[$#innerstack]
Line 301 sub recurse {	Line 297 sub recurse {
&Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");	&Apache::lonxml::warning("Unbalanced tags in resource $innerstack['-1']");
pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);	pop @innerstack;pop @innerparstack;&decreasedepth($tokenpat);
}	}
$partstring = &callsub("end_$tokenpat->[1]",	$partstring = &callsub("end_$tokenpat->[1]", $target, $tokenpat,
$target, $tokenpat, \@innerparstack,	\@innerstack, \@innerparstack, \@pat,
\@pat, $safeeval, $style_for_target);	$safeeval, $style_for_target);
} else {	} else {
&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");	&Apache::lonxml::error("Unknown token event :$tokenpat->[0]:$tokenpat->[1]:");
}	}
Line 336 sub recurse {	Line 332 sub recurse {
}	}

sub callsub {	sub callsub {
my ($sub,$target,$token,$parstack,$parser,$safeeval,$style)=@_;	my ($sub,$target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $currentstring='';	my $currentstring='';
my $nodefault;	my $nodefault;
{	{
my $sub1;	my $sub1;
no strict 'refs';	no strict 'refs';
if ($target eq 'edit' && $token->[0] eq 'S') {	if ($target eq 'edit' && $token->[0] eq 'S') {
$currentstring = &Apache::edit::tag_start($target,$token,$parstack,$parser,	$currentstring = &Apache::edit::tag_start($target,$token,$tagstack,
	$parstack,$parser,
$safeeval,$style);	$safeeval,$style);
}	}
my $tag=$token->[1];	my $tag=$token->[1];
Line 357 sub callsub {	Line 354 sub callsub {
#&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");	#&Apache::lonxml::debug("Calling sub $sub in $space $metamode<br />\n");
$sub1="$space\:\:$sub";	$sub1="$space\:\:$sub";
$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);	$Apache::lonxml::curdepth=join('_',@Apache::lonxml::depthcounter);
($currentstring,$nodefault) = &$sub1($target,$token,$parstack,$parser,	($currentstring,$nodefault) = &$sub1($target,$token,$tagstack,
$safeeval,$style);	$parstack,$parser,$safeeval,
	$style);
} else {	} else {
#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");	#&Apache::lonxml::debug("NOT Calling sub $sub in $space $metamode<br />\n");
if ($metamode <1) {	if ($metamode <1) {
Line 369 sub callsub {	Line 367 sub callsub {
}	}
}	}
}	}
&Apache::lonxml::debug("nodefalt:$nodefault:");	# &Apache::lonxml::debug("nodefalt:$nodefault:");
if ($currentstring eq '' && $nodefault eq '') {	if ($currentstring eq '' && $nodefault eq '') {
if ($target eq 'edit') {	if ($target eq 'edit') {
&Apache::lonxml::debug("doing default edit for $token->[1]");	&Apache::lonxml::debug("doing default edit for $token->[1]");
Line 392 sub callsub {	Line 390 sub callsub {
return $currentstring;	return $currentstring;
}	}

	sub init_safespace {
	my ($target,$safeeval,$safehole,$safeinit) = @_;
	$safeeval->permit("entereval");
	$safeeval->permit(":base_math");
	$safeeval->permit("sort");
	$safeeval->deny(":base_io");
	$safehole->wrap(\&Apache::lonnet::EXT,$safeeval,'&EXT');

	$safehole->wrap(\&Math::Cephes::asin,$safeeval,'&asin');
	$safehole->wrap(\&Math::Cephes::acos,$safeeval,'&acos');
	$safehole->wrap(\&Math::Cephes::atan,$safeeval,'&atan');
	$safehole->wrap(\&Math::Cephes::sinh,$safeeval,'&sinh');
	$safehole->wrap(\&Math::Cephes::cosh,$safeeval,'&cosh');
	$safehole->wrap(\&Math::Cephes::tanh,$safeeval,'&tanh');
	$safehole->wrap(\&Math::Cephes::asinh,$safeeval,'&asinh');
	$safehole->wrap(\&Math::Cephes::acosh,$safeeval,'&acosh');
	$safehole->wrap(\&Math::Cephes::atanh,$safeeval,'&atanh');
	$safehole->wrap(\&Math::Cephes::erf,$safeeval,'&erf');
	$safehole->wrap(\&Math::Cephes::erfc,$safeeval,'&erfc');
	$safehole->wrap(\&Math::Cephes::j0,$safeeval,'&j0');
	$safehole->wrap(\&Math::Cephes::j1,$safeeval,'&j1');
	$safehole->wrap(\&Math::Cephes::jn,$safeeval,'&jn');
	$safehole->wrap(\&Math::Cephes::jv,$safeeval,'&jv');
	$safehole->wrap(\&Math::Cephes::y0,$safeeval,'&y0');
	$safehole->wrap(\&Math::Cephes::y1,$safeeval,'&y1');
	$safehole->wrap(\&Math::Cephes::yn,$safeeval,'&yn');
	$safehole->wrap(\&Math::Cephes::yv,$safeeval,'&yv');

	#need to inspect this class of ops
	# $safeeval->deny(":base_orig");
	$safeinit .= ';$external::target='.$target.';';
	$safeinit .= ';$external::randomseed='.&Apache::lonnet::rndseed().';';
	&Apache::run::run($safeinit,$safeeval);
	}

sub startredirection {	sub startredirection {
$Apache::lonxml::redirection++;	$Apache::lonxml::redirection++;
push (@Apache::lonxml::outputstack, '');	push (@Apache::lonxml::outputstack, '');
Line 571 ENDSCRIPT	Line 604 ENDSCRIPT
return $result;	return $result;
}	}

	sub storefile {
	my ($file,$contents)=@_;
	if (my $fh=Apache::File->new('>'.$file)) {
	print $fh $contents;
	$fh->close();
	}
	}

sub inserteditinfo {	sub inserteditinfo {
my ($result,$filecontents)=@_;	my ($result,$filecontents)=@_;
unless ($filecontents) {	unless ($filecontents) {
Line 621 sub handler {	Line 662 sub handler {

return OK if $request->header_only;	return OK if $request->header_only;


	my $file=&Apache::lonnet::filelocation("",$request->uri);
#	#
# Edit action? Save file.	# Edit action? Save file.
#	#
unless ($ENV{'request.state'} eq 'published') {	unless ($ENV{'request.state'} eq 'published') {
if ($ENV{'form.savethisfile'}) {	if ($ENV{'form.savethisfile'}) {
	&storefile($file,$ENV{'form.filecont'});
}	}
}	}

my $file=&Apache::lonnet::filelocation("",$request->uri);
my %mystyle;	my %mystyle;
my $result = '';	my $result = '';
my $filecontents=&Apache::lonnet::getfile($file);	my $filecontents=&Apache::lonnet::getfile($file);
Line 697 sub warning {	Line 738 sub warning {
}	}
}	}

	sub get_param {
	my ($param,$parstack,$safeeval,$context) = @_;
	if ( ! $context ) { $context = -1; }
	my $args ='';
	if ( $#$parstack > (-2-$context) ) { $args=$$parstack[$context]; }
	return &Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #'
	}

sub register_insert {	sub register_insert {
my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');	my @data = split /\n/, &Apache::lonnet::getfile('/home/httpd/lonTabs/insertlist.tab');
my $i;	my $i;

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

Removed from v.1.78
changed lines
	Added in v.1.84