version 1.338, 2004/08/29 08:14:41
|
version 1.342, 2004/10/07 16:27:48
|
Line 51 use Math::Cephes();
|
Line 51 use Math::Cephes();
|
use Math::Random(); |
use Math::Random(); |
use Opcode(); |
use Opcode(); |
use POSIX qw(strftime); |
use POSIX qw(strftime); |
|
use Time::HiRes qw( gettimeofday tv_interval ); |
|
|
sub register { |
sub register { |
my ($space,@taglist) = @_; |
my ($space,@taglist) = @_; |
Line 815 sub initdepth {
|
Line 815 sub initdepth {
|
$Apache::lonxml::olddepth=-1; |
$Apache::lonxml::olddepth=-1; |
} |
} |
|
|
|
my @timers; |
|
my $lasttime; |
sub increasedepth { |
sub increasedepth { |
my ($token) = @_; |
my ($token) = @_; |
$Apache::lonxml::depth++; |
$Apache::lonxml::depth++; |
Line 822 sub increasedepth {
|
Line 824 sub increasedepth {
|
if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) { |
if ($Apache::lonxml::depthcounter[$Apache::lonxml::depth]==1) { |
$Apache::lonxml::olddepth=$Apache::lonxml::depth; |
$Apache::lonxml::olddepth=$Apache::lonxml::depth; |
} |
} |
|
my $time; |
|
if ($Apache::lonxml::debug eq "1") { |
|
push(@timers,[&gettimeofday()]); |
|
$time=&tv_interval($lasttime); |
|
$lasttime=[&gettimeofday()]; |
|
} |
|
my $spacing=' 'x($Apache::lonxml::depth-1); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
&Apache::lonxml::debug("s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"); |
&Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : \n"); |
#print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"; |
#print "<br />s $Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1]\n"; |
} |
} |
|
|
Line 838 sub decreasedepth {
|
Line 847 sub decreasedepth {
|
&Apache::lonxml::warning(&mt("Missing tags, unable to properly run file.")); |
&Apache::lonxml::warning(&mt("Missing tags, unable to properly run file.")); |
$Apache::lonxml::depth='-1'; |
$Apache::lonxml::depth='-1'; |
} |
} |
|
my ($timer,$time); |
|
if ($Apache::lonxml::debug eq "1") { |
|
$timer=pop(@timers); |
|
$time=&tv_interval($lasttime); |
|
$lasttime=[&gettimeofday()]; |
|
} |
|
my $spacing=' 'x$Apache::lonxml::depth; |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
&Apache::lonxml::debug("e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"); |
&Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : ".&tv_interval($timer)."\n"); |
#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"; |
#print "<br />e $Apache::lonxml::depth : $Apache::lonxml::olddepth : $token->[1] : $curdepth\n"; |
} |
} |
|
|
Line 1012 sub parstring {
|
Line 1028 sub parstring {
|
unless ($_=~/\W/) { |
unless ($_=~/\W/) { |
my $val=$token->[2]->{$_}; |
my $val=$token->[2]->{$_}; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
$val =~ s/([\%\@\\\"\'])/\\$1/g; |
|
$val =~ s/(\$[^{a-zA-Z_])/\\$1/g; |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
$temp .= "my \$$_=\"$val\";"; |
$temp .= "my \$$_=\"$val\";"; |
} |
} |
Line 1461 sub get_param_var {
|
Line 1478 sub get_param_var {
|
} elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; } |
} elsif ( $args !~ /my \$\Q$param\E=\"/ ) { return undef; } |
my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #' |
my $value=&Apache::run::run("{$args;".'return $'.$param.'}',$safeeval); #' |
&Apache::lonxml::debug("first run is $value"); |
&Apache::lonxml::debug("first run is $value"); |
if ($value =~ /^[\$\@\%]\w+$/) { |
if ($value =~ /^[\$\@\%][a-zA-Z_]\w*$/) { |
&Apache::lonxml::debug("doing second"); |
&Apache::lonxml::debug("doing second"); |
my @result=&Apache::run::run("return $value",$safeeval,1); |
my @result=&Apache::run::run("return $value",$safeeval,1); |
if (!defined($result[0])) { |
if (!defined($result[0])) { |