--- loncom/xml/scripttag.pm 2004/07/15 16:43:37 1.113
+++ loncom/xml/scripttag.pm 2007/08/30 22:56:43 1.143
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ';
+ &Apache::loncommon::lonhttpd_port().'\';';
}
return ('','no');
}
@@ -107,25 +113,40 @@ sub start_script {
if ( $target eq "modified" ) {
$result=$token->[4].&Apache::edit::modifiedfield('/script',$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("/script",$parser);
if (!$Apache::lonxml::default_homework_loaded) {
&Apache::lonxml::default_homework_load($safeeval);
}
&Apache::run::run($bodytext,$safeeval);
if (($target eq 'answer') &&
- ($ENV{'form.answer_output_mode'} ne 'tex') &&
+ ($env{'form.answer_output_mode'} ne 'tex') &&
($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;
- my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
- $result.="Script Vars
";
+ $script_var.=$listing;
+ $script_var.= "<\\/pre>$end_page');newWindow.document.close();newWindow.focus()}
+// ]]>
+Script Vars
";
+ &Apache::lonxml::add_script_result($script_var);
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -138,7 +159,7 @@ sub start_script {
}
} else {
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
- if ($target ne "meta") {
+ if ($target ne "meta" && $target ne 'tex') {
$result = $token->[4];
$result.=$bodytext;
}
@@ -152,7 +173,7 @@ sub end_script {
my $type = &Apache::lonxml::get_param('type',$parstack,$safeeval);
my $result='';
#other script blocks need to survive
- if ($type ne "loncapa/perl") {
+ if ($type ne "loncapa/perl" && $target ne 'tex') {
return $token->[2];
} elsif ($target eq 'edit' ) {
return &Apache::edit::end_table();
@@ -164,14 +185,14 @@ sub end_script {
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
+ @Apache::scripttag::parser_env = @_;
my $result;
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);
@@ -179,7 +200,10 @@ sub start_display {
$result=&Apache::run::run($bodytext,$safeeval);
if ($target eq 'grade' || $target eq 'answer' ||
$target eq 'analyze') {
- $result=''; # grade should produce no output
+ # 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=''; }
}
$Apache::lonxml::post_evaluate=0;
} elsif ($target eq "edit" ) {
@@ -209,7 +233,7 @@ sub start_scriptlib {
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
$target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'webgrade') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -255,7 +279,7 @@ sub start_parserlib {
my $error='';
if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
$target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
- $target eq 'analyze') {
+ $target eq 'analyze' || $target eq 'webgrade') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -296,19 +320,19 @@ sub end_parserlib {
sub start_window {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'webgrade') {
&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::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); }
}
@@ -318,7 +342,7 @@ sub start_window {
sub end_window {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
- if ($target eq 'web') {
+ if ($target eq 'web' || $target eq 'webgrade') {
my $output=&Apache::lonxml::endredirection;
$output =~ s/[\n\r]/ /g;
# $output = &HTML::Entities::encode($output,'<>&"\'');
@@ -329,7 +353,23 @@ 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 {
@@ -345,8 +385,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);
@@ -359,7 +399,7 @@ sub start_import {
my $dir=$location;
$dir=~s:/[^/]*$::;
# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ my $id= &Apache::lonxml::get_id($parstack,$safeeval);
if (!$id) { $id=$Apache::lonxml::curdepth; }
push(@Apache::inputtags::import,$id);
push(@Apache::inputtags::importlist,$id);
@@ -376,7 +416,7 @@ sub start_import {
} elsif ($target eq 'modified') {
$result=$token->[4].&Apache::edit::modifiedfield("/import",$parser);
} elsif ($target eq 'meta') {
- my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ my $id= &Apache::lonxml::get_id($parstack,$safeeval);
$result.='[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') {
+ } 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;
}
@@ -495,12 +537,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' || $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__