version 1.338, 2004/08/29 08:14:41
|
version 1.345, 2004/10/18 19:49:58
|
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 159 sub xmlbegin {
|
Line 159 sub xmlbegin {
|
.'<html xmlns:math="http://www.w3.org/1998/Math/MathML" ' |
.'<html xmlns:math="http://www.w3.org/1998/Math/MathML" ' |
.'xmlns="http://www.w3.org/TR/REC-html40">'; |
.'xmlns="http://www.w3.org/TR/REC-html40">'; |
} else { |
} else { |
$output='<html>'; |
$output='<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
|
<html>'; |
} |
} |
return $output; |
return $output; |
} |
} |
Line 287 sub fontsettings() {
|
Line 288 sub fontsettings() {
|
my $headerstring=''; |
my $headerstring=''; |
if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { |
if (($ENV{'browser.os'} eq 'mac') && (!$ENV{'browser.mathml'})) { |
$headerstring.= |
$headerstring.= |
'<meta Content-Type="text/html; charset=x-mac-roman">'; |
'<meta Content-Type="text/html; charset=x-mac-roman" />'; |
} elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) { |
} elsif (!$ENV{'browser.mathml'} && $ENV{'browser.unicode'}) { |
$headerstring.= |
$headerstring.= |
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; |
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; |
Line 815 sub initdepth {
|
Line 816 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 825 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 848 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 1029 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 1271 $bodytag
|
Line 1289 $bodytag
|
</body> |
</body> |
</html> |
</html> |
ENDNOTFOUND |
ENDNOTFOUND |
$filecontents=''; |
$filecontents=''; |
if ($ENV{'request.state'} ne 'published') { |
if ($ENV{'request.state'} ne 'published') { |
if ($filetype eq 'sty') { |
if ($filetype eq 'sty') { |
$filecontents=&createnewsty(); |
$filecontents=&createnewsty(); |
Line 1282 ENDNOTFOUND
|
Line 1300 ENDNOTFOUND
|
} |
} |
} else { |
} else { |
unless ($ENV{'request.state'} eq 'published') { |
unless ($ENV{'request.state'} eq 'published') { |
|
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.')); |
|
} |
|
|
if ($ENV{'form.attemptclean'}) { |
if ($ENV{'form.attemptclean'}) { |
$filecontents=&htmlclean($filecontents,1); |
$filecontents=&htmlclean($filecontents,1); |
} |
} |
Line 1461 sub get_param_var {
|
Line 1483 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])) { |
Line 1551 sub whichuser {
|
Line 1573 sub whichuser {
|
if (defined($ENV{'form.grade_symb'})) { |
if (defined($ENV{'form.grade_symb'})) { |
my $tmp_courseid=$ENV{'form.grade_courseid'}; |
my $tmp_courseid=$ENV{'form.grade_courseid'}; |
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid); |
my $allowed=&Apache::lonnet::allowed('vgr',$tmp_courseid); |
|
if (!$allowed && |
|
exists($ENV{'request.course.sec'}) && |
|
$ENV{'request.course.sec'} !~ /^\s*$/) { |
|
$allowed=&Apache::lonnet::allowed('vgr',$ENV{'form.grade_courseid'}. |
|
'/'.$ENV{'request.course.sec'}); |
|
} |
if ($allowed) { |
if ($allowed) { |
$symb=$ENV{'form.grade_symb'}; |
$symb=$ENV{'form.grade_symb'}; |
$courseid=$ENV{'form.grade_courseid'}; |
$courseid=$ENV{'form.grade_courseid'}; |