--- loncom/xml/scripttag.pm 2004/10/12 23:26:48 1.120
+++ loncom/xml/scripttag.pm 2006/03/23 23:47:56 1.135
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Script Vars
";
+ $result.= "$end_page');newWindow.document.close();newWindow.focus()}
+// ]]>
+Script Vars
";
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -169,8 +180,8 @@ sub start_display {
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
} elsif ( $target eq 'web' || $target eq 'tex' ||
- $target eq 'grade' || $target eq 'answer' ||
- $target eq 'analyze') {
+ $target eq 'grade' || $target eq 'webgrade' ||
+ $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);
@@ -305,12 +316,12 @@ sub start_window {
} 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::text_arg('Height:','height',$token,5);
+ $result.=&Apache::edit::text_arg('Width:','width',$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',
+ $safeeval,'linktext',
'width','height');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
@@ -331,7 +342,15 @@ sub end_window {
if (!$width) { $width='500'; }
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
if (!$height) { $height='200'; }
- $result = "$linktext";
+
+ my $start_page =
+ &Apache::loncommon::start_page($linktext, undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'js_ready' => 1,});
+ my $end_page =
+ &Apache::loncommon::end_page({'js_ready' => 1,});
+ $result = "$linktext";
} elsif ($target eq 'tex') {
$result = '}';
} else {
@@ -347,8 +366,8 @@ sub start_import {
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
- $target eq 'tex' || $target eq 'analyze' ) {
+ if ($target eq 'web' || $target eq 'webgrade' || $target eq 'grade'
+ || $target eq 'answer' || $target eq 'tex' || $target eq 'analyze' ) {
# FIXME this probably needs to be smart about construction vs.
# non construction space.
my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
@@ -438,8 +457,8 @@ sub start_standalone {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' ) {
- if ( $ENV{'request.course.id'} ) {
- my $inside = &Apache::lonxml::get_all_text("/standalone",$parser);
+ if ( $env{'request.course.id'} ) {
+ my $inside = &Apache::lonxml::get_all_text("/standalone",$parser,$style);
} else {
$result='
';
}
@@ -451,7 +470,7 @@ sub end_standalone {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
if ($target eq 'web' ) {
- if ( $ENV{'request.course.id'} ) {
+ if ( $env{'request.course.id'} ) {
} else {
$result=' |
';
}
@@ -464,14 +483,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);
+ 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("/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);
+ my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser,$style);
}
return $result;
}
@@ -498,12 +517,89 @@ sub xmlparse {
@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);
- &Apache::lonxml::debug("xmlparse recursion ending with $result");
+ $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') {
+ $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') {
+ 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') {
+ 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__