version 1.77, 2002/09/23 17:25:24
|
version 1.80, 2002/10/30 23:37:57
|
Line 57 sub start_script {
|
Line 57 sub start_script {
|
if ( $target eq "modified" ) { |
if ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield(); |
$result=$token->[4].&Apache::edit::modifiedfield(); |
} elsif ( $target eq 'web' || $target eq 'tex' || |
} elsif ( $target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer') { |
$target eq 'grade' || $target eq 'answer' || |
&Apache::run::run($bodytext,$safeeval); |
$target eq 'analyze' ) { |
if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) { |
if (!$Apache::lonxml::default_homework_loaded) { |
$Apache::lonxml::evaluate--; |
&Apache::lonxml::default_homework_load($safeeval); |
$result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor="#FFFFFF"><pre>"; |
} |
my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval)); |
&Apache::run::run($bodytext,$safeeval); |
|
if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) { |
$result.=$listing; |
$Apache::lonxml::evaluate--; |
$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />"; |
$result.="<a href=\"javascript:newWindow=open(\'\',\'new_W\',\'width=500,height=200,scrollbars=1\');newWindow.document.open(\'text/html\',\'replace\');newWindow.document.writeln(\'<html><head><title>newwindow</title></head><body bgcolor="#FFFFFF"><pre>"; |
} |
my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval)); |
|
|
|
$result.=$listing; |
|
$result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars</a><br />"; |
|
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
#&Apache::run::run($bodytext,$safeeval); |
#&Apache::run::run($bodytext,$safeeval); |
#$result="<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />"; |
#$result="<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />"; |
Line 93 sub end_script {
|
Line 97 sub end_script {
|
return $token->[2]; |
return $token->[2]; |
} elsif ($target eq 'edit' ) { |
} elsif ($target eq 'edit' ) { |
return &Apache::edit::end_table(); |
return &Apache::edit::end_table(); |
} elsif (($target eq 'answer')) { |
} elsif ($target eq 'answer') { |
$Apache::lonxml::evaluate++; |
$Apache::lonxml::evaluate++; |
} |
} |
return ''; |
return ''; |
Line 108 sub start_display {
|
Line 112 sub start_display {
|
if ( $target eq "modified" ) { |
if ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield(); |
$result=$token->[4].&Apache::edit::modifiedfield(); |
} elsif ( $target eq 'web' || $target eq 'tex' || |
} elsif ( $target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer') { |
$target eq 'grade' || $target eq 'answer' || |
$result=&Apache::run::run($bodytext,$safeeval); |
$target eq 'analyze') { |
if ($target eq 'grade' || $target eq 'answer' ) { |
if (!$Apache::lonxml::default_homework_loaded) { |
$result=''; # grade should produce no output |
&Apache::lonxml::default_homework_load($safeeval); |
} |
} |
|
$result=&Apache::run::run($bodytext,$safeeval); |
|
if ($target eq 'grade' || $target eq 'answer' || |
|
$target eq 'analyze') { |
|
$result=''; # grade should produce no output |
|
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
#$result = |
#$result = |
# "<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />"; |
# "<br /> <$token->[1]> output: <br />$bodytext<br />Source:<br />"; |
Line 135 sub start_scriptlib {
|
Line 144 sub start_scriptlib {
|
my $result =''; |
my $result =''; |
my $error=''; |
my $error=''; |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || |
|
$target eq 'edit' || $target eq 'answer' || $target eq 'analyze') { |
$bodytext=$$parser[$#$parser]->get_text("/scriptlib"); |
$bodytext=$$parser[$#$parser]->get_text("/scriptlib"); |
$bodytext=&Apache::run::evaluate($bodytext,$safeeval, |
$bodytext=&Apache::run::evaluate($bodytext,$safeeval, |
$$parstack[$#$parstack]); |
$$parstack[$#$parstack]); |
Line 180 sub start_parserlib {
|
Line 190 sub start_parserlib {
|
my $bodytext; |
my $bodytext; |
my $result =""; |
my $result =""; |
my $error=''; |
my $error=''; |
if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || |
|
$target eq 'edit' || $target eq 'answer' || $target eq 'analyze') { |
$bodytext=$$parser[$#$parser]->get_text("/parserlib"); |
$bodytext=$$parser[$#$parser]->get_text("/parserlib"); |
$bodytext=&Apache::run::evaluate($bodytext,$safeeval, |
$bodytext=&Apache::run::evaluate($bodytext,$safeeval, |
$$parstack[$#$parstack]); |
$$parstack[$#$parstack]); |
Line 253 sub start_import {
|
Line 264 sub start_import {
|
|
|
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); |
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); |
|
|
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||$target eq 'tex') { |
if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || |
|
$target eq 'tex' || $target eq 'analyze' ) { |
# FIXME this probably needs to be smart about construction vs. |
# FIXME this probably needs to be smart about construction vs. |
# non construction space. |
# non construction space. |
my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); |
my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); |
Line 370 sub start_comment {
|
Line 382 sub start_comment {
|
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) |
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) |
} elsif ( $target eq 'modified') { |
} elsif ( $target eq 'modified') { |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
$result=$token->[4].&Apache::edit::modifiedfield($token); |
} elsif ( $target eq 'web' || $target eq 'tex' || |
} elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
$target eq 'grade' || $target eq 'answer' || $target eq 'meta') { |
$target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { |
#normally throw away comments |
#normally throw away comments |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]); |
} |
} |