--- loncom/xml/scripttag.pm 2003/10/03 17:15:01 1.101 +++ loncom/xml/scripttag.pm 2011/12/19 18:18:32 1.162 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # '; - } - return ('','no'); -} - -sub end_LONCAPA_INTERNAL_LONHTTPD_PORT { - return ('','no'); -} - sub start_script { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; @Apache::scripttag::parser_env = @_; @@ -104,40 +87,46 @@ sub start_script { my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval); &Apache::lonxml::debug("found type of $type"); if ($type eq "loncapa/perl") { - my $bodytext=&Apache::lonxml::get_all_text("/script",$parser); if ( $target eq "modified" ) { - $result=$token->[4].&Apache::edit::modifiedfield(); + $result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); } elsif ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer' || - $target eq 'analyze' ) { + $target eq 'grade' || $target eq 'webgrade' || + $target eq 'answer' || $target eq 'analyze' ) { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); if (!$Apache::lonxml::default_homework_loaded) { &Apache::lonxml::default_homework_load($safeeval); } &Apache::run::run($bodytext,$safeeval); if (($target eq 'answer') && - ($ENV{'form.answer_output_mode'} ne 'tex') && + ($env{'form.answer_output_mode'} ne 'tex') && ($Apache::lonhomework::viewgrades == 'F')) { $Apache::lonxml::evaluate--; - $result.="Script Vars
"; + my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); + $uname =~s/\W//g; + $udom =~s/\W//g; + my $function_name = + join('_','LONCAPA_scriptvars',$uname,$udom, + $env{'form.counter'},$Apache::lonxml::curdepth); + &Apache::lonxml::add_script_result( + &Apache::loncommon::modal_adhoc_window($function_name,500,500, + '
'.&Apache::run::dump($target,$safeeval).'
', + &mt('Script Vars'))."
"); } } elsif ($target eq "edit" ) { #&Apache::run::run($bodytext,$safeeval); #$result="
<$token->[1]> output:
$bodytext
Source:
"; - $result=&Apache::edit::tag_start($target,$token,'Script'); - $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4); + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); + $result=&Apache::edit::tag_start($target,$token,'Script'); + $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4); + } elsif ($target eq 'meta') { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); } } else { - if ($target ne "meta") { - $result = $token->[4]; - my $bodytext=&Apache::lonxml::get_all_text("/script",$parser); - $result.=$bodytext; - } + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); + if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') { + $result = $token->[4]; + $result.=$bodytext; + } } return $result; } @@ -148,7 +137,7 @@ sub end_script { my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval); my $result=''; #other script blocks need to survive - if ($type ne "loncapa/perl") { + if ($type ne "loncapa/perl" && $target ne 'tex') { return $token->[2]; } elsif ($target eq 'edit' ) { return &Apache::edit::end_table(); @@ -160,30 +149,36 @@ sub end_script { sub start_display { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - + @Apache::scripttag::parser_env = @_; my $result; - my $bodytext=&Apache::lonxml::get_all_text("/display",$parser); if ( $target eq "modified" ) { - $result=$token->[4].&Apache::edit::modifiedfield(); + $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); } elsif ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer' || - $target eq 'analyze') { + $target eq 'grade' || $target eq 'webgrade' || + $target eq 'answer' || $target eq 'analyze') { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); if (!$Apache::lonxml::default_homework_loaded) { &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 + # 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=''; } } $Apache::lonxml::post_evaluate=0; } elsif ($target eq "edit" ) { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); #$result = # "
<$token->[1]> output:
$bodytext
Source:
"; #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1); $result=&Apache::edit::tag_start($target,$token,'Script With Display'); $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1) + } elsif ($target eq 'meta') { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); } return $result; } @@ -200,8 +195,9 @@ sub start_scriptlib { my $result =''; my $error=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || - $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'meta' || $target eq 'edit' || $target eq 'answer' || + $target eq 'analyze' || $target eq 'webgrade') { $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); $bodytext=&Apache::run::evaluate($bodytext,$safeeval, $$parstack[$#$parstack]); @@ -210,7 +206,7 @@ sub start_scriptlib { my $script=&Apache::lonnet::getfile($location); if ($script == -1) { if ($target eq 'edit') { - $error='Errors Unable to find '.$location.''."\n"; + $error=''.&mt('Errors').''.&mt(' Unable to find [_1]',''.$location.'').''."\n"; } else { &Apache::lonxml::error(" Unable to find $location for scriptlib"); return ""; @@ -228,9 +224,7 @@ sub start_scriptlib { &Apache::edit::end_table(); } if ($target eq "modified" ) { - $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser); } return $result; } @@ -247,8 +241,9 @@ sub start_parserlib { my $bodytext; my $result =""; my $error=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || - $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') { + if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'meta' || $target eq 'edit' || $target eq 'answer' || + $target eq 'analyze' || $target eq 'webgrade') { $bodytext=$$parser[$#$parser]->get_text("/parserlib"); $bodytext=&Apache::run::evaluate($bodytext,$safeeval, $$parstack[$#$parstack]); @@ -274,9 +269,7 @@ sub start_parserlib { &Apache::edit::end_table(); } if ($target eq "modified" ) { - $bodytext=$$parser[$#$parser]->get_text("/parserlib"); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser); } return $result; } @@ -289,31 +282,42 @@ sub end_parserlib { } sub start_window { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result = ''; - if ($target eq 'web') { - &Apache::lonxml::startredirection; - } elsif ($target eq 'tex') { - $result = '\unskip\footnote{'; - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result = ''; + if ($target eq 'web' || $target eq 'webgrade') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'tex') { + $result = '\unskip\footnote{'; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); + $result.=&Apache::edit::text_arg('Height:','height',$token,5); + $result.=&Apache::edit::text_arg('Width:','width',$token,5); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'linktext', + 'width','height'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; } sub end_window { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result; - if ($target eq 'web') { + if ($target eq 'web' || $target eq 'webgrade') { my $output=&Apache::lonxml::endredirection; - $output =~ s/[\n\r]/ /g; -# $output = &HTML::Entities::encode($output,'<>&"\''); - $output =~ s/\'/\\\'/g; my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval); if (!$linktext) { $linktext='*'; } my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); if (!$width) { $width='500'; } my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); if (!$height) { $height='200'; } - $result = "$linktext"; + + my ($start_page,$end_page); + $result=&Apache::loncommon::modal_adhoc_window + ("LONCAPA_newwindow_$Apache::lonxml::curdepth",$width,$height,$output,$linktext); } elsif ($target eq 'tex') { $result = '}'; } else { @@ -322,15 +326,63 @@ sub end_window { return $result; } + +sub start_togglebox { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result = ''; + if ($target eq 'web' || $target eq 'webgrade') { + my $id="LONCAPA_togglebox_$Apache::lonxml::curdepth"; + my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval); + unless ($heading) { $heading=''; } else { $heading.=' '; } + my $showtext=&Apache::lonxml::get_param('showtext',$parstack,$safeeval); + my $hidetext=&Apache::lonxml::get_param('hidetext',$parstack,$safeeval); + my $headerbg=&Apache::lonxml::get_param('headerbg',$parstack,$safeeval); + $result=&Apache::loncommon::start_togglebox($id,$heading,$headerbg,$hidetext,$showtext); + } elsif ($target eq 'tex') { + my $heading=&Apache::lonxml::get_param('heading',$parstack,$safeeval); + unless ($heading) { $heading=''; } else { $heading.=' '; } + $result = "\n\n".'\fbox{{\bf '.$heading.'} \qquad '."\n"; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Heading:','heading',$token,70); + $result.=&Apache::edit::text_arg('Header Background:','headerbg',$token,7); + $result.=&Apache::edit::text_arg('Show text:','showtext',$token,10); + $result.=&Apache::edit::text_arg('Hide text:','hidetext',$token,10); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'heading', + 'showtext','hidetext', + 'headerbg','textbg'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; +} + +sub end_togglebox { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + if ($target eq 'web' || $target eq 'webgrade') { + $result=&Apache::loncommon::end_togglebox(); + } elsif ($target eq 'tex') { + $result = "}\n\n"; + } else { + $result = ''; + } + return $result; +} + + + sub start_import { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $bodytext=$$parser[$#$parser]->get_text("/import"); my $result =""; - $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' || $target eq 'analyze' ) { + if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade' + || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) { # FIXME this probably needs to be smart about construction vs. # non construction space. my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); @@ -339,35 +391,63 @@ sub start_import { &Apache::lonxml::error(" Unable to find $bodytext as $location for import"); return ""; } - + my $importmode=&Apache::lonxml::get_param('importmode',$parstack,$safeeval); + if (($importmode eq 'problem') || ($importmode eq 'part')) { +# We are using import to import published problems + if (($importmode eq 'problem') || ($file=~//s)) { +# We explicitly don't want this to be a separate part or the problem already has parts + $file=~s/^\s*//s; + $file=~s/<\/problem>\s*$/<\/library>/s; + } else { +# We want this to be a separate part, but it currently is not + $file=~s/^\s*//s; + $file=~s/<\/problem>\s*$/<\/part><\/library>/s; + } + } my $dir=$location; $dir=~s:/[^/]*$::; # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); - my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + my $id= &Apache::lonxml::get_id($parstack,$safeeval); if (!$id) { $id=$Apache::lonxml::curdepth; } push(@Apache::inputtags::import,$id); push(@Apache::inputtags::importlist,$id); - &Apache::lonxml::newparser($parser,\$file,$dir); + &Apache::lonxml::newparser($parser,\$file,$dir); } elsif ($target eq "edit" ) { $result.=&Apache::edit::tag_start($target,$token); - $result.=&Apache::edit::editline($token->[1],$bodytext,'',40); + my $location=$token->[1]; + $location=~s/^\s*//s; + $location=~s/\s*$//s; + $result.=&Apache::edit::editline($location,$bodytext,'',40); $result.=&Apache::edit::browse(undef,'textnode'); + $result.= ' '; #FIXME this need to convert $bodytext to be a contruction space reference #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); #$result.="Clickhere to edit
" } elsif ($target eq 'modified') { - $bodytext=$$parser[$#$parser]->get_text("/import"); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + &Apache::edit::get_new_args($token,$parstack,$safeeval,'importmode'); + $result=''; + $result.=&Apache::edit::modifiedfield("/import",$parser); } elsif ($target eq 'meta') { - my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); + my $id= &Apache::lonxml::get_id($parstack,$safeeval); $result.=''; + $result.='" importmode="'.$token->[2]{'importmode'}.'">'; $result.=$bodytext; $result.=''; } @@ -378,7 +458,8 @@ sub end_import { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; pop(@Apache::inputtags::import); my $result; - if ($target eq 'edit' ) { $result=&Apache::edit::end_table(); } + if ($target eq 'edit' ) { $result=&Apache::edit::end_row. + &Apache::edit::end_table(); } return $result; } @@ -420,9 +501,9 @@ sub end_physnet { sub start_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { - if ( $ENV{'request.course.id'} ) { - my $inside = &Apache::lonxml::get_all_text("/standalone",$parser); + if ($target eq 'web' || $target eq 'webgrade') { + if ( $env{'request.course.id'} ) { + my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style); } else { $result='
'; } @@ -433,8 +514,8 @@ sub start_standalone { sub end_standalone { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result=''; - if ($target eq 'web' ) { - if ( $ENV{'request.course.id'} ) { + if ($target eq 'web' || $target eq 'webgrade' ) { + if ( $env{'request.course.id'} ) { } else { $result='
'; } @@ -447,14 +528,15 @@ sub start_comment { my $result=''; if ($target eq 'edit') { $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) } elsif ( $target eq 'modified') { - $result=$token->[4].&Apache::edit::modifiedfield($token); - } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || - $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { + $result=$token->[4].&Apache::edit::modifiedfield("/comment",$parser); + } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'answer' || $target eq 'meta' || $target eq 'analyze' || + $target eq 'webgrade') { #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; } @@ -468,16 +550,119 @@ sub end_comment { sub xmlparse { my ($string) = @_; -# &Apache::lonxml::debug("Got $string"); + &Apache::lonxml::debug("xmlparse recursion starting with $string"); + # Apache::run::evaluate does an 'eval' on the name of the subroutine + # if it detects something that looks like a subroutine, this ends up calling + # things without any arguments and since perl is nice enough to pass + # along the default arguments when you don't explicitly say no arguments + # if you call &xmlparse, it gets &xmlparse passed as it argument. + # Same thing soccurs with &chemparse. + if ($string eq '&xmlparse') { return '&xmlparse'; } + if ($string eq '&chemparse') { return '&chemparse'; } my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)= @Apache::scripttag::parser_env; my @parser; &Apache::lonxml::newparser(\@parser,\$string); + &Apache::lonxml::startredirection(); my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack, $parstack,\@parser, $safeeval,$style); + $result.=&Apache::lonxml::endredirection(); + &Apache::lonxml::debug("target is $target xmlparse recursion ending with $result"); return $result; } +sub start_num { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser); + if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') { + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + my $format=&Apache::lonxml::get_param('format',$parstack,$safeeval); + $result=&Apache::run::run("return &prettyprint(q\0$inside\0,q\0$format\0);",$safeeval); + } + return $result; +} + +sub end_num { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + +sub start_parse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze'|| $target eq 'webgrade') { + my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser); + $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if (!$Apache::lonxml::default_homework_loaded) { + &Apache::lonxml::default_homework_load($safeeval); + } + @Apache::scripttag::parser_env = @_; + $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; +} + +sub end_parse { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + +sub start_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + if ( $target eq 'web' || $target eq 'tex' || + $target eq 'grade' || $target eq 'answer' || + $target eq 'analyze' || $target eq 'webgrade') { + my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser); + $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]); + if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') { + my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval); + $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval); + } + $Apache::lonxml::post_evaluate=0; + } + return $result; +} + +sub end_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; +} + 1; __END__ + +=pod + +=head1 NAME + +Apache::scripttag.pm + +=head1 SYNOPSIS + +implements