--- loncom/xml/scripttag.pm 2003/06/18 20:36:32 1.98
+++ loncom/xml/scripttag.pm 2004/04/15 20:24:34 1.112
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# 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_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("/script",$parser);
- $result.=$bodytext;
- }
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+ if ($target ne "meta") {
+ $result = $token->[4];
+ $result.=$bodytext;
+ }
}
return $result;
}
@@ -141,13 +166,13 @@ sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
my $result;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$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_unbalanced("/display",$parser);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
@@ -156,12 +181,16 @@ 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_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;
}
@@ -178,8 +207,9 @@ sub start_scriptlib {
my $result ='';
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
- $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -206,9 +236,7 @@ sub start_scriptlib {
&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;
}
@@ -225,8 +253,9 @@ sub start_parserlib {
my $bodytext;
my $result ="";
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
- $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -252,9 +281,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;
}
@@ -267,14 +294,25 @@ sub end_parserlib {
}
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 = '\unskip\footnote{';
- }
- return $result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result = '';
+ if ($target eq 'web') {
+ &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:','width',$token,5);
+ $result.=&Apache::edit::text_arg('Width:','height',$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,'linttext',
+ 'width','height');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
}
sub end_window {
@@ -336,9 +374,7 @@ sub start_import {
#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.='[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
@@ -446,7 +482,8 @@ sub end_comment {
sub xmlparse {
my ($string) = @_;
-# &Apache::lonxml::debug("Got $string");
+ &Apache::lonxml::debug("xmlparse recursion starting with $string");
+ if ($string eq '&xmlparse') { return '&xmlparse'; }
my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
@Apache::scripttag::parser_env;
my @parser;
@@ -454,6 +491,7 @@ sub xmlparse {
my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
$parstack,\@parser,
$safeeval,$style);
+ &Apache::lonxml::debug("xmlparse recursion ending with $result");
return $result;
}