|
version 1.339, 2004/10/05 18:51:50
|
version 1.341, 2004/10/05 20:18:29
|
|
Line 824 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; |
| } |
} |
| push(@timers,[&gettimeofday()]); |
my $time; |
| my $time=&tv_interval($lasttime); |
if ($Apache::lonxml::debug eq "1") { |
| $lasttime=[&gettimeofday()]; |
push(@timers,[&gettimeofday()]); |
| |
$time=&tv_interval($lasttime); |
| |
$lasttime=[&gettimeofday()]; |
| |
} |
| my $spacing=' 'x($Apache::lonxml::depth-1); |
my $spacing=' 'x($Apache::lonxml::depth-1); |
| my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
| &Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : \n"); |
&Apache::lonxml::debug("s$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : \n"); |
|
Line 844 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=pop(@timers); |
my ($timer,$time); |
| my $time=&tv_interval($lasttime); |
if ($Apache::lonxml::debug eq "1") { |
| $lasttime=[&gettimeofday()]; |
$timer=pop(@timers); |
| |
$time=&tv_interval($lasttime); |
| |
$lasttime=[&gettimeofday()]; |
| |
} |
| my $spacing=' 'x$Apache::lonxml::depth; |
my $spacing=' 'x$Apache::lonxml::depth; |
| my $curdepth=join('_',@Apache::lonxml::depthcounter); |
my $curdepth=join('_',@Apache::lonxml::depthcounter); |
| &Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : ".&tv_interval($timer)."\n"); |
&Apache::lonxml::debug("e$spacing$Apache::lonxml::depth : $Apache::lonxml::olddepth : $curdepth : $token->[1] : $time : ".&tv_interval($timer)."\n"); |
|
Line 1022 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/^(\$\d)/\\$1/; |
| #if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
#if ($val =~ m/^[\%\@]/) { $val="\\".$val; } |
| $temp .= "my \$$_=\"$val\";"; |
$temp .= "my \$$_=\"$val\";"; |
| } |
} |
|
Line 1471 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])) { |
![[BACK]](/icons/back.gif){kind=icon}
Return to lonxml.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / xml