--- loncom/xml/scripttag.pm 2002/11/13 23:15:40 1.82
+++ loncom/xml/scripttag.pm 2003/05/22 21:05:01 1.89
@@ -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 = @_;
@@ -63,7 +80,7 @@ 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]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield();
} elsif ( $target eq 'web' || $target eq 'tex' ||
@@ -73,7 +90,9 @@ sub start_script {
&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.="[4];
- my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
$result.=$bodytext;
}
}
@@ -117,7 +136,7 @@ sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield();
@@ -176,7 +195,8 @@ sub start_scriptlib {
if ($target eq "edit" ) {
$result=
&Apache::edit::tag_start($target,$token,'New Script Functions').
- &Apache::edit::editline($token->[1],$bodytext,'',40).
+ &Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
+ &Apache::edit::browse(undef,'textnode').
$error.''.
&Apache::edit::end_table();
}
@@ -291,10 +311,13 @@ sub start_import {
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
if (!$id) { $id=$Apache::lonxml::curdepth; }
push(@Apache::inputtags::import,$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);
+ $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
"
@@ -363,7 +386,7 @@ sub start_standalone {
my $result='';
if ($target eq 'web' ) {
if ( $ENV{'request.course.id'} ) {
- my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]);
+ my $inside = &Apache::lonxml::get_all_text("/standalone",$parser);
} else {
$result='
'; } @@ -388,14 +411,14 @@ 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[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); $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') { #normally throw away comments - my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); } return $result; } @@ -409,7 +432,7 @@ sub end_comment { sub xmlparse { my ($string) = @_; - &Apache::lonxml::debug("Got $string"); +# &Apache::lonxml::debug("Got $string"); my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)= @Apache::scripttag::parser_env; my @parser; |