--- loncom/xml/scripttag.pm 2006/03/23 23:47:56 1.135
+++ loncom/xml/scripttag.pm 2008/11/24 18:55:01 1.149
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ';
+ &Apache::loncommon::lonhttpd_port().'\';';
}
return ('','no');
}
@@ -116,7 +115,7 @@ sub start_script {
($env{'form.answer_output_mode'} ne 'tex') &&
($Apache::lonhomework::viewgrades == 'F')) {
$Apache::lonxml::evaluate--;
- my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+ my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
my $start_page =
&Apache::loncommon::start_page('Script Vars', undef,
@@ -126,16 +125,22 @@ sub start_script {
my $end_page =
&Apache::loncommon::end_page({'js_ready' => 1,});
- $result.="Script Vars
";
+".&mt('Script Vars')."
";
+ &Apache::lonxml::add_script_result($script_var);
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
@@ -148,7 +153,7 @@ sub start_script {
}
} else {
my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
- if ($target ne "meta" && $target ne 'tex') {
+ if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
$result = $token->[4];
$result.=$bodytext;
}
@@ -222,7 +227,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]);
@@ -231,7 +236,7 @@ sub start_scriptlib {
my $script=&Apache::lonnet::getfile($location);
if ($script == -1) {
if ($target eq 'edit') {
- $error='
Errors | Unable to find '.$location.' | '."\n";
+ $error='
'.&mt('Errors').' | '.&mt(' Unable to find [_1]',''.$location.'').' | '."\n";
} else {
&Apache::lonxml::error(" Unable to find $location for scriptlib");
return "";
@@ -268,7 +273,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]);
@@ -309,7 +314,7 @@ 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{';
@@ -318,11 +323,13 @@ sub start_window {
$result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70);
$result.=&Apache::edit::text_arg('Height:','height',$token,5);
$result.=&Apache::edit::text_arg('Width:','width',$token,5);
+ $result.=&Apache::edit::text_arg('Mime Type:','mimetype',$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,'linktext',
- 'width','height');
+ 'width','height',
+ 'mimetype');
if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
}
return $result;
@@ -331,7 +338,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,'<>&"\'');
@@ -342,15 +349,30 @@ sub end_window {
if (!$width) { $width='500'; }
my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval);
if (!$height) { $height='200'; }
+ my $mimetype= &Apache::lonxml::get_param('mimetype',$parstack,$safeeval)
+ || 'text/html';
- 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";
+ my ($start_page,$end_page);
+ if ($mimetype eq 'text/html') {
+ $start_page =
+ &Apache::loncommon::start_page($linktext, undef,
+ {'only_body' => 1,
+ 'bgcolor' => '#FFFFFF',
+ 'js_ready' => 1,});
+ $end_page =
+ &Apache::loncommon::end_page({'js_ready' => 1,});
+ }
+ $result = "$linktext";
} elsif ($target eq 'tex') {
$result = '}';
} else {
@@ -380,12 +402,12 @@ 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);
- &Apache::lonxml::newparser($parser,\$file,$dir);
+ &Apache::lonxml::newparser($parser,\$file,$dir);
} elsif ($target eq "edit" ) {
$result.=&Apache::edit::tag_start($target,$token);
@@ -397,7 +419,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.='
';
@@ -487,8 +509,9 @@ sub start_comment {
$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') {
+ } 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,$style);
}
@@ -530,7 +553,7 @@ 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') {
+ 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);
@@ -551,9 +574,9 @@ sub end_num {
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') {
+ 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) {
@@ -581,14 +604,14 @@ sub end_parse {
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') {
+ 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);
+ $result=&Apache::lontexconvert::algebra($inside,$target,$style,$parstack,$safeeval);
}
$Apache::lonxml::post_evaluate=0;
}
@@ -603,3 +626,33 @@ sub end_algebra {
1;
__END__
+
+=pod
+
+=head1 NAME
+
+Apache::scripttag.pm
+
+=head1 SYNOPSIS
+
+implements