--- loncom/xml/scripttag.pm 2002/10/21 20:31:06 1.79 +++ loncom/xml/scripttag.pm 2007/11/17 01:51:11 1.147 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # '; + } + return ('','no'); +} + +sub end_LONCAPA_INTERNAL_LONHTTPD_PORT { + return ('','no'); } sub start_script { @@ -53,36 +111,62 @@ 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[$#$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') && ($Apache::lonhomework::viewgrades == 'F')) { + if (($target eq 'answer') && + ($env{'form.answer_output_mode'} ne 'tex') && + ($Apache::lonhomework::viewgrades == 'F')) { $Apache::lonxml::evaluate--; - $result.="newwindow"; - my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval)); - - $result.=$listing; - $result.= "
"; - my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval)); - - $result.=$listing; - $result.= "