<$token->[1]> output:
$bodytext
Source:
"; - $result.=&editfield($token->[1],$bodytext); + $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 { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + if ($target eq 'edit' ) { return &Apache::edit::end_table(); } + return ''; } sub start_scriptlib { - my ($target,$token,$parstack,$parser,$safeeval)=@_; - my $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); - my $result =""; - - $bodytext=&Apache::run::evaluate($bodytext,$safeeval, - $$parstack[$#$parstack]); - my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'], - $bodytext); - my $script=&Apache::lonnet::getfile($location); - if ($script == -1) { - &Apache::lonxml::error(" Unable to find $location for scriptlib"); - return ""; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $bodytext; + my $result =''; + my $error=''; + + 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]); + my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'], + $bodytext); + my $script=&Apache::lonnet::getfile($location); + if ($script == -1) { + if ($target eq 'edit') { + $error='
".&Apache::lonnet::getfile($bodytext)."
"); } - &Apache::run::run($script,$safeeval); - #&Apache::lonxml::debug("ran $bodytext:
".&Apache::lonnet::getfile($bodytext)."
"); - if ($target eq "edit" ) { - $result.=&editfield($token->[1],$bodytext); + $result= + &Apache::edit::tag_start($target,$token,'New Script Functions'). + &Apache::edit::editline($token->[1],$bodytext,'scriptlib',40). + &Apache::edit::browse(undef,'textnode'). + $error.'