';
}
@@ -411,8 +479,8 @@ sub start_standalone {
sub end_standalone {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
- if ($target eq 'web' ) {
- if ( $ENV{'request.course.id'} ) {
+ if ($target eq 'web' || $target eq 'webgrade' ) {
+ if ( $env{'request.course.id'} ) {
} else {
$result=' |
';
}
@@ -425,14 +493,15 @@ 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);
+ my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
$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') {
+ $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' ||
+ $target eq 'webgrade') {
#normally throw away comments
- my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser);
+ my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
}
return $result;
}
@@ -446,16 +515,102 @@ sub end_comment {
sub xmlparse {
my ($string) = @_;
-# &Apache::lonxml::debug("Got $string");
+ &Apache::lonxml::debug("xmlparse recursion starting with $string");
+ # Apache::run::evaluate does an 'eval' on the name of the subroutine
+ # if it detects something that looks like a subroutine, this ends up calling
+ # things without any arguments and since perl is nice enough to pass
+ # along the default arguments when you don't explicitly say no arguments
+ # if you call &xmlparse, it gets &xmlparse passed as it argument.
+ # Same thing soccurs with &chemparse.
+ if ($string eq '&xmlparse') { return '&xmlparse'; }
+ if ($string eq '&chemparse') { return '&chemparse'; }
my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)=
@Apache::scripttag::parser_env;
my @parser;
&Apache::lonxml::newparser(\@parser,\$string);
+ &Apache::lonxml::startredirection();
my $result=&Apache::lonxml::inner_xmlparse($target,$tagstack,
$parstack,\@parser,
$safeeval,$style);
+ $result.=&Apache::lonxml::endredirection();
+ &Apache::lonxml::debug("target is $target xmlparse recursion ending with $result");
return $result;
}
+sub start_num {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/num",$parser);
+ if ($target eq 'tex' || $target eq 'web' || $target eq 'webgrade') {
+ $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ @Apache::scripttag::parser_env = @_;
+ my $format=&Apache::lonxml::get_param('format',$parstack,$safeeval);
+ $result=&Apache::run::run("return &prettyprint(q\0$inside\0,q\0$format\0);",$safeeval);
+ }
+ return $result;
+}
+
+sub end_num {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ return $result;
+}
+
+sub start_parse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ if ( $target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'analyze'|| $target eq 'webgrade') {
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/parse",$parser);
+ $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ @Apache::scripttag::parser_env = @_;
+ $result=&Apache::run::run("return &xmlparse(q\0$inside\0);",$safeeval);
+ if ($target eq 'grade' || $target eq 'answer' ||
+ $target eq 'analyze') {
+ # grade/answer/analyxe should produce no output but if we
+ # are redirecting, the redirecter should know what to do
+ # with the output
+ if (!$Apache::lonxml::redirection) { $result=''; }
+ }
+ }
+ return $result;
+}
+
+sub end_parse {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ return $result;
+}
+
+sub start_algebra {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ if ( $target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'analyze' || $target eq 'webgrade') {
+ my $inside = &Apache::lonxml::get_all_text_unbalanced("/algebra",$parser);
+ $inside = &Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'analyze') {
+ my $style=&Apache::lonxml::get_param('style',$parstack,$safeeval);
+ $result=&Apache::lontexconvert::algebra($inside,$target,$style);
+ }
+ $Apache::lonxml::post_evaluate=0;
+ }
+ return $result;
+}
+
+sub end_algebra {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
+ my $result = '';
+ return $result;
+}
+
1;
__END__