newwindow";
- my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
-
+ $result.="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("/script",$parser);
+ $result=&Apache::edit::tag_start($target,$token,'Script');
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
}
} else {
if ($target ne "meta") {
$result = $token->[4];
- my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
$result.=$bodytext;
}
}
@@ -117,13 +163,13 @@ sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$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') {
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -132,7 +178,9 @@ sub start_display {
$target eq 'analyze') {
$result=''; # grade should produce no output
}
+ $Apache::lonxml::post_evaluate=0;
} elsif ($target eq "edit" ) {
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
#$result =
# "
<$token->[1]> output:
$bodytext
Source:
";
#$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
@@ -176,14 +224,13 @@ 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();
}
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;
}
@@ -227,9 +274,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;
}
@@ -257,8 +302,16 @@ sub end_window {
my $result;
if ($target eq 'web') {
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'; }
+ $result = "$linktext";
} elsif ($target eq 'tex') {
$result = '}';
} else {
@@ -291,17 +344,19 @@ 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);
+ 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') {
- $bodytext=$$parser[$#$parser]->get_text("/import");
- $result=$token->[4].&Apache::edit::modifiedfield($token);
- &Apache::lonxml::debug($result);
+ $result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
} elsif ($target eq 'meta') {
my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
$result.='';
}
@@ -388,14 +443,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);
+ $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') {
#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 +464,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;
|