--- loncom/xml/scripttag.pm 2004/02/11 15:10:05 1.108 +++ loncom/xml/scripttag.pm 2004/04/15 20:24:34 1.112 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Script Vars
"; + $result.= "');newWindow.document.close();}Script Vars
"; } } elsif ($target eq "edit" ) { #&Apache::run::run($bodytext,$safeeval); @@ -136,11 +137,11 @@ sub start_script { 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_unbalanced("/script",$parser); - $result.=$bodytext; - } + if ($target ne "meta") { + $result = $token->[4]; + $result.=$bodytext; + } } return $result; } @@ -182,7 +183,7 @@ sub start_display { } $Apache::lonxml::post_evaluate=0; } elsif ($target eq "edit" ) { - my $bodytext=&Apache::lonxml::get_all_text_unblanced("/display",$parser); + 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); @@ -481,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; @@ -489,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; }