--- loncom/xml/scripttag.pm 2001/06/02 03:59:59 1.40 +++ loncom/xml/scripttag.pm 2007/08/03 23:29:54 1.142 @@ -1,37 +1,160 @@ # 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 = @_; my $result=''; 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[$#$parser]); - if ( $target eq "modified" ) { - $result=$token->[4].$bodytext; - } elsif ( $target eq "web" || $target eq "grade" ) { - &Apache::run::run($bodytext,$safeeval); + $result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); + } elsif ( $target eq 'web' || $target eq 'tex' || + $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') && + ($Apache::lonhomework::viewgrades == 'F')) { + $Apache::lonxml::evaluate--; + my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser(); + my $windowopen=&Apache::lonhtmlcommon::javascript_docopen(); + 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 Vars
"; + &Apache::lonxml::add_script_result($script_var); + } } elsif ($target eq "edit" ) { - &Apache::run::run($bodytext,$safeeval); - $result="
<$token->[1]> output:
$bodytext
Source:
"; - $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,5); + #&Apache::run::run($bodytext,$safeeval); + #$result="
<$token->[1]> output:
$bodytext
Source:
"; + 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_unbalanced("/script",$parser); + if ($target ne "meta" && $target ne 'tex') { + $result = $token->[4]; + $result.=$bodytext; + } } return $result; } @@ -42,32 +165,56 @@ 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") { return $token->[2]; } + if ($type ne "loncapa/perl" && $target ne 'tex') { + return $token->[2]; + } elsif ($target eq 'edit' ) { + return &Apache::edit::end_table(); + } elsif ($target eq 'answer') { + $Apache::lonxml::evaluate++; + } return ''; } sub start_display { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - - my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]); + @Apache::scripttag::parser_env = @_; + my $result; if ( $target eq "modified" ) { - } - my $result=&Apache::run::run($bodytext,$safeeval); - if ($target eq 'grade' ) { - # grade should produce no output - $result=''; - } - if ($target eq "edit" ) { - $result = - "
<$token->[1]> output:
$bodytext
Source:
"; - $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1); + $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); + } elsif ( $target eq 'web' || $target eq 'tex' || + $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') { + # 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; } sub end_display { - return '' + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'edit' ) { return &Apache::edit::end_table(); } + return ''; } sub start_scriptlib { @@ -76,7 +223,9 @@ sub start_scriptlib { my $result =''; my $error=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') { + 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]); @@ -96,23 +245,23 @@ sub start_scriptlib { } if ($target eq "edit" ) { $result= - &Apache::edit::tag_start($target,$token). - &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1). - $error; + &Apache::edit::tag_start($target,$token,'New Script Functions'). + &Apache::edit::editline($token->[1],$bodytext,'scriptlib',40). + &Apache::edit::browse(undef,'textnode'). + $error.''. + &Apache::edit::end_table(); } if ($target eq "modified" ) { - $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); - $result=&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser); } return $result; } sub end_scriptlib { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; -# if ($target eq "edit" ) { $result=" "; } - return $result; + my @result; + if ($target eq "edit" ) { $result[1]='no'; } + return @result; } sub start_parserlib { @@ -120,8 +269,9 @@ sub start_parserlib { my $bodytext; my $result =""; my $error=''; - - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') { + 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]); @@ -141,45 +291,77 @@ sub start_parserlib { } if ($target eq "edit" ) { $result= - &Apache::edit::tag_start($target,$token). - &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1). - $error; + &Apache::edit::tag_start($target,$token,'New Tag Definitions'). + &Apache::edit::editline($token->[1],$bodytext,'',40). + $error.''. + &Apache::edit::end_table(); } if ($target eq "modified" ) { - $bodytext=$$parser[$#$parser]->get_text("/parserlib"); - $result=&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser); } return $result; } sub end_parserlib { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result=''; -# if ($target eq "edit" ) { -# $result=&Apache::edit::tag_end($target,$token); -# } - return $result; + my @result; + if ($target eq "edit" ) { $result[1]='no'; } + return @result; } 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 = '\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/\"/\"\;/g; - $result = "newwindow $output \');newWindow.document.close();void(0);\">*"; + $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'; } + + 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 = "$linktext"; } elsif ($target eq 'tex') { $result = '}'; } else { @@ -194,41 +376,241 @@ sub start_import { my $result =""; $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); - my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); - my $file=&Apache::lonnet::getfile($location); - if ($file == -1) { - &Apache::lonxml::error(" Unable to find $bodytext $location for import"); - return ""; - } - my $dir=$location; - $dir=~s:/[^/]*$::; -# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); - &Apache::lonxml::newparser($parser,\$file,$dir); + 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); + my $file=&Apache::lonnet::getfile($location); + if ($file == -1) { + &Apache::lonxml::error(" Unable to find $bodytext as $location for import"); + return ""; + } - if ($target eq "edit" ) { - $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1); - $result.="Clickhere to edit
" + my $dir=$location; + $dir=~s:/[^/]*$::; + # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n"); + 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); + + } elsif ($target eq "edit" ) { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::editline($token->[1],$bodytext,'',40); + $result.=&Apache::edit::browse(undef,'textnode'); + #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') { + $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser); + } elsif ($target eq 'meta') { + my $id= &Apache::lonxml::get_id($parstack,$safeeval); + $result.=''; + $result.=$bodytext; + $result.=''; } - return ''; + return $result; } 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_row. + &Apache::edit::end_table(); } + return $result; } -sub start_meta { +sub start_storetc { my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; my $result = ''; - if ($target ne 'meta') { - $result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]); - $result = ''; - return $result; + &Apache::lonxml::startredirection; + return $result; +} + +sub end_storetc { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result; + my $output=&Apache::lonxml::endredirection; + $output =~ s/\"/\"\;/g; + $result = '{\bf '.$output.'.}}\write\tcfile{\protect\tcpc{ '.$output.'.}{\the\value{relpage}}}'; + return $result; +} + + +sub start_physnet { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $bodytext = '/adm/includes/physnet.sty'; + my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext); + my $cbistyletext=&Apache::lonnet::getfile($location); + + %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext)); + $$parser['-1']->unget_token($token); +# if ( defined($$style{'physnet'}) ) { +# &Apache::lonxml::newparser($parser,\$$style{'physnet'}); +# } + return ""; +} + +sub end_physnet { + return ''; +} + +sub start_standalone { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'webgrade') { + if ( $env{'request.course.id'} ) { + my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style); + } else { + $result='
'; + } + } + return $result; +} + +sub end_standalone { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' || $target eq 'webgrade' ) { + if ( $env{'request.course.id'} ) { } else { - return $result; + $result='
'; + } + } + return $result; +} + +sub start_comment { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'edit') { + $result=&Apache::edit::tag_start($target,$token); + 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("/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,$style); + } + return $result; +} + +sub end_comment { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'edit' ) { return &Apache::edit::end_table(); } + return ''; +} + + +sub xmlparse { + my ($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); + } + $Apache::lonxml::post_evaluate=0; } + return $result; } -sub end_meta { +sub end_algebra { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_; + my $result = ''; + return $result; } 1;