version 1.129, 2005/06/27 21:01:58
|
version 1.142, 2007/08/03 23:29:54
|
Line 82 sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
|
Line 82 sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF
|
|
|
sub start_LONCAPA_INTERNAL_LONHTTPD_PORT { |
sub start_LONCAPA_INTERNAL_LONHTTPD_PORT { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'}; |
if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } |
if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; } |
return '<script type="text/javascript">var lonhttpdport=\''. |
return '<script type="text/javascript">var lonhttpdport=\''. |
Line 105 sub start_script {
|
Line 105 sub start_script {
|
if ( $target eq "modified" ) { |
if ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); |
$result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); |
} 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 'webgrade' || |
$target eq 'analyze' ) { |
$target eq 'answer' || $target eq 'analyze' ) { |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
Line 116 sub start_script {
|
Line 116 sub start_script {
|
($env{'form.answer_output_mode'} ne 'tex') && |
($env{'form.answer_output_mode'} ne 'tex') && |
($Apache::lonhomework::viewgrades == 'F')) { |
($Apache::lonhomework::viewgrades == 'F')) { |
$Apache::lonxml::evaluate--; |
$Apache::lonxml::evaluate--; |
my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser(); |
my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); |
$result.="<script type=\"text/javascript\"> |
my $start_page = |
|
&Apache::loncommon::start_page('Script Vars', undef, |
|
{'only_body' => 1, |
|
'bgcolor' => '#FFFFFF', |
|
'js_ready' => 1,}); |
|
my $end_page = |
|
&Apache::loncommon::end_page({'js_ready' => 1,}); |
|
|
|
$uname =~s/\W//g; |
|
$udom =~s/\W//g; |
|
my $script_var ="<script type=\"text/javascript\"> |
// <![CDATA[ |
// <![CDATA[ |
function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('<html><head><title>Script Vars</title></head><body bgcolor=\"#FFFFFF\"><pre>"; |
function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('$start_page<pre>"; |
my $listing=&Apache::run::dump($target,$safeeval); |
my $listing=&Apache::run::dump($target,$safeeval); |
$listing=~s/\\/\\\\/g; |
$listing=~s/\\/\\\\/g; |
$listing=~s/\'/\\\'/g; |
$listing=~s/\'/\\\'/g; |
$result.=$listing; |
$script_var.=$listing; |
$result.= "</pre></body></html>');newWindow.document.close();newWindow.focus()} |
$script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()} |
// ]]> |
// ]]> |
</script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />"; |
</script><a href=\"javascript:LONCAPA_scriptvars_".$uname."_".$udom."_$Apache::lonxml::curdepth();void(0);\">Script Vars</a><br />"; |
|
&Apache::lonxml::add_script_result($script_var); |
} |
} |
} elsif ($target eq "edit" ) { |
} elsif ($target eq "edit" ) { |
#&Apache::run::run($bodytext,$safeeval); |
#&Apache::run::run($bodytext,$safeeval); |
Line 172 sub start_display {
|
Line 183 sub start_display {
|
if ( $target eq "modified" ) { |
if ( $target eq "modified" ) { |
$result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); |
$result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); |
} 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 'webgrade' || |
$target eq 'analyze') { |
$target eq 'answer' || $target eq 'analyze') { |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); |
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
Line 214 sub start_scriptlib {
|
Line 225 sub start_scriptlib {
|
|
|
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
$target eq 'meta' || $target eq 'edit' || $target eq 'answer' || |
$target eq 'meta' || $target eq 'edit' || $target eq 'answer' || |
$target eq 'analyze') { |
$target eq 'analyze' || $target eq 'webgrade') { |
$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 260 sub start_parserlib {
|
Line 271 sub start_parserlib {
|
my $error=''; |
my $error=''; |
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
$target eq 'meta' || $target eq 'edit' || $target eq 'answer' || |
$target eq 'meta' || $target eq 'edit' || $target eq 'answer' || |
$target eq 'analyze') { |
$target eq 'analyze' || $target eq 'webgrade') { |
$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 301 sub end_parserlib {
|
Line 312 sub end_parserlib {
|
sub start_window { |
sub start_window { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result = ''; |
my $result = ''; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
&Apache::lonxml::startredirection; |
&Apache::lonxml::startredirection; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result = '\unskip\footnote{'; |
$result = '\unskip\footnote{'; |
} elsif ($target eq 'edit') { |
} elsif ($target eq 'edit') { |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::tag_start($target,$token); |
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); |
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); |
$result.=&Apache::edit::text_arg('Height:','width',$token,5); |
$result.=&Apache::edit::text_arg('Height:','height',$token,5); |
$result.=&Apache::edit::text_arg('Width:','height',$token,5); |
$result.=&Apache::edit::text_arg('Width:','width',$token,5); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
$result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); |
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
my $constructtag=&Apache::edit::get_new_args($token,$parstack, |
Line 323 sub start_window {
|
Line 334 sub start_window {
|
sub end_window { |
sub end_window { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result; |
my $result; |
if ($target eq 'web') { |
if ($target eq 'web' || $target eq 'webgrade') { |
my $output=&Apache::lonxml::endredirection; |
my $output=&Apache::lonxml::endredirection; |
$output =~ s/[\n\r]/ /g; |
$output =~ s/[\n\r]/ /g; |
# $output = &HTML::Entities::encode($output,'<>&"\''); |
# $output = &HTML::Entities::encode($output,'<>&"\''); |
Line 334 sub end_window {
|
Line 345 sub end_window {
|
if (!$width) { $width='500'; } |
if (!$width) { $width='500'; } |
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); |
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); |
if (!$height) { $height='200'; } |
if (!$height) { $height='200'; } |
$result = "<script type=\"text/javascript\"> function LONCAPA_newwindow_$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=$width,height=$height,scrollbars=1');newWindow.document.open('text/html','replace');newWindow.document.writeln('<html><head><title>newwindow</title></head><body bgcolor=\"#FFFFFF\"> $output </body></html>');newWindow.document.close();}</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>"; |
|
|
my $start_page = |
|
&Apache::loncommon::start_page($linktext, undef, |
|
{'only_body' => 1, |
|
'bgcolor' => '#FFFFFF', |
|
'js_ready' => 1,}); |
|
my $end_page = |
|
&Apache::loncommon::end_page({'js_ready' => 1,}); |
|
$result = "<script type=\"text/javascript\"> |
|
//<!-- |
|
function LONCAPA_newwindow_$Apache::lonxml::curdepth() { |
|
newWindow=open(".&Apache::lonhtmlcommon::javascript_nothing().",'new_W','width=$width,height=$height,scrollbars=1'); |
|
newWindow.".&Apache::lonhtmlcommon::javascript_docopen()."; |
|
newWindow.document.writeln('$start_page $output $end_page'); |
|
newWindow.document.close();} |
|
//--> |
|
</script><a href=\"javascript:LONCAPA_newwindow_$Apache::lonxml::curdepth();void(0);\">$linktext</a>"; |
} elsif ($target eq 'tex') { |
} elsif ($target eq 'tex') { |
$result = '}'; |
$result = '}'; |
} else { |
} else { |
Line 350 sub start_import {
|
Line 377 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' || |
if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade' |
$target eq 'tex' || $target eq 'analyze' ) { |
|| $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 364 sub start_import {
|
Line 391 sub start_import {
|
my $dir=$location; |
my $dir=$location; |
$dir=~s:/[^/]*$::; |
$dir=~s:/[^/]*$::; |
# &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n"); |
# &Apache::lonxml::debug("directory $dir $location file $file \n<b>END</b>\n"); |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id= &Apache::lonxml::get_id($parstack,$safeeval); |
if (!$id) { $id=$Apache::lonxml::curdepth; } |
if (!$id) { $id=$Apache::lonxml::curdepth; } |
push(@Apache::inputtags::import,$id); |
push(@Apache::inputtags::import,$id); |
push(@Apache::inputtags::importlist,$id); |
push(@Apache::inputtags::importlist,$id); |
Line 381 sub start_import {
|
Line 408 sub start_import {
|
} elsif ($target eq 'modified') { |
} elsif ($target eq 'modified') { |
$result=$token->[4].&Apache::edit::modifiedfield("/import",$parser); |
$result=$token->[4].&Apache::edit::modifiedfield("/import",$parser); |
} elsif ($target eq 'meta') { |
} elsif ($target eq 'meta') { |
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); |
my $id= &Apache::lonxml::get_id($parstack,$safeeval); |
$result.='<import part="'.$Apache::inputtags::part; |
$result.='<import part="'.$Apache::inputtags::part; |
if ($id) { |
if ($id) { |
$result.='" id="'.$id; |
$result.='" id="'.$id; |
Line 440 sub end_physnet {
|
Line 467 sub end_physnet {
|
sub start_standalone { |
sub start_standalone { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' ) { |
if ($target eq 'web' || $target eq 'webgrade') { |
if ( $env{'request.course.id'} ) { |
if ( $env{'request.course.id'} ) { |
my $inside = &Apache::lonxml::get_all_text("/standalone",$parser); |
my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style); |
} else { |
} else { |
$result='<table bgcolor="#E1E1E1" border="2"><tr><td>'; |
$result='<table bgcolor="#E1E1E1" border="2"><tr><td>'; |
} |
} |
Line 453 sub start_standalone {
|
Line 480 sub start_standalone {
|
sub end_standalone { |
sub end_standalone { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; |
my $result=''; |
my $result=''; |
if ($target eq 'web' ) { |
if ($target eq 'web' || $target eq 'webgrade' ) { |
if ( $env{'request.course.id'} ) { |
if ( $env{'request.course.id'} ) { |
} else { |
} else { |
$result='</td></tr></table>'; |
$result='</td></tr></table>'; |
Line 467 sub start_comment {
|
Line 494 sub start_comment {
|
my $result=''; |
my $result=''; |
if ($target eq 'edit') { |
if ($target eq 'edit') { |
$result=&Apache::edit::tag_start($target,$token); |
$result=&Apache::edit::tag_start($target,$token); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); |
$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("/comment",$parser); |
$result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser); |
} elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
} elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || |
$target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { |
$target eq 'answer' || $target eq 'meta' || $target eq 'analyze' || |
|
$target eq 'webgrade') { |
#normally throw away comments |
#normally throw away comments |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); |
my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style); |
} |
} |
return $result; |
return $result; |
} |
} |
Line 501 sub xmlparse {
|
Line 529 sub xmlparse {
|
@Apache::scripttag::parser_env; |
@Apache::scripttag::parser_env; |
my @parser; |
my @parser; |
&Apache::lonxml::newparser(\@parser,\$string); |
&Apache::lonxml::newparser(\@parser,\$string); |
|
&Apache::lonxml::startredirection(); |
my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, |
my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, |
$parstack,\@parser, |
$parstack,\@parser, |
$safeeval,$style); |
$safeeval,$style); |
|
$result.=&Apache::lonxml::endredirection(); |
&Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); |
&Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); |
return $result; |
return $result; |
} |
} |
Line 512 sub start_num {
|
Line 542 sub start_num {
|
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $result = ''; |
my $result = ''; |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser); |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser); |
if ($target eq 'tex' || $target eq 'web') { |
if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') { |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
&Apache::lonxml::default_homework_load($safeeval); |
&Apache::lonxml::default_homework_load($safeeval); |
Line 533 sub end_num {
|
Line 563 sub end_num {
|
sub start_parse { |
sub start_parse { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $result = ''; |
my $result = ''; |
if ( $target eq 'web' || $target eq 'tex' || |
if ( $target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer' || |
$target eq 'grade' || $target eq 'answer' || |
$target eq 'analyze') { |
$target eq 'analyze'|| $target eq 'webgrade') { |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser); |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
if (!$Apache::lonxml::default_homework_loaded) { |
if (!$Apache::lonxml::default_homework_loaded) { |
Line 543 sub start_parse {
|
Line 573 sub start_parse {
|
} |
} |
@Apache::scripttag::parser_env = @_; |
@Apache::scripttag::parser_env = @_; |
$result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval); |
$result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval); |
|
if ($target eq 'grade' || $target eq 'answer' || |
|
$target eq 'analyze') { |
|
# grade/answer/analyxe should produce no output but if we |
|
# are redirecting, the redirecter should know what to do |
|
# with the output |
|
if (!$Apache::lonxml::redirection) { $result=''; } |
|
} |
} |
} |
return $result; |
return $result; |
} |
} |
Line 556 sub end_parse {
|
Line 593 sub end_parse {
|
sub start_algebra { |
sub start_algebra { |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; |
my $result = ''; |
my $result = ''; |
if ( $target eq 'web' || $target eq 'tex' || |
if ( $target eq 'web' || $target eq 'tex' || |
$target eq 'grade' || $target eq 'answer' || |
$target eq 'grade' || $target eq 'answer' || |
$target eq 'analyze') { |
$target eq 'analyze' || $target eq 'webgrade') { |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser); |
my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser); |
$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
$inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |
if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { |