--- loncom/xml/scripttag.pm 2003/05/23 16:26:28 1.90
+++ loncom/xml/scripttag.pm 2012/02/05 23:00:06 1.165
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# ';
+ $Apache::lonxml::usestyle=0;
+ my $end=&Apache::lonxml::get_param('end',$parstack,$safeeval);
+ if (!$end) {
+ $Apache::lonxml::style_values=$$parstack[-1];
+ $Apache::lonxml::style_end_values=$$parstack[-1];
+ } else {
+ $Apache::lonxml::style_values=$Apache::lonxml::style_end_values;
+ $Apache::lonxml::style_end_values='';
}
return ('','no');
}
-sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
+sub end_LONCAPA_INTERNAL_TURN_STYLE_OFF {
return ('','no');
}
@@ -80,38 +87,78 @@ sub start_script {
my $type= &Apache::lonxml::get_param('type',$parstack,$safeeval);
&Apache::lonxml::debug("found type of $type");
if ($type eq "loncapa/perl") {
- my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
if ( $target eq "modified" ) {
- $result=$token->[4].&Apache::edit::modifiedfield();
+ $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--;
- $result.="Script Vars
";
+ my (undef,undef,$udom,$uname)=&Apache::lonnet::whichuser();
+ $uname =~s/\W//g;
+ $udom =~s/\W//g;
+ my $function_name =
+ join('_','LONCAPA_scriptvars',$uname,$udom,
+ $env{'form.counter'},$Apache::lonxml::curdepth);
+ &Apache::lonxml::add_script_result(
+ &Apache::loncommon::modal_adhoc_window($function_name,500,500,
+ '
'.&Apache::run::dump($target,$safeeval).'
',
+ &mt('Script Vars'))."
");
}
} elsif ($target eq "edit" ) {
#&Apache::run::run($bodytext,$safeeval);
#$result="
<$token->[1]> output:
$bodytext
Source:
";
- $result=&Apache::edit::tag_start($target,$token,'Script');
- $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+ $result=&Apache::edit::tag_start($target,$token,'Script');
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
+ } elsif ($target eq 'meta') {
+ 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("/script",$parser);
- $result.=$bodytext;
- }
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser);
+ if ($target ne "meta" && $target ne 'tex' && $target ne 'answer') {
+ $result = $token->[4];
+ $result.=$bodytext;
+ if ($type eq "text/javascript") {
+ my $src=&Apache::lonxml::get_param('src',$parstack,$safeeval,undef,1);
+ if (($src =~ /\.js$/) && ($src !~ m{^(/|https?://)})) {
+ my ($path,$scriptname) = ($src =~ m{^(.+)/([^/]*)$});
+ my $docuri =
+ $Apache::lonnet::env{'request.noversionuri'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($docuri =~ m{^(\Q/uploaded/$cdom/$cnum\E)/(docs/.*/)[^/]+$}) {
+ my $prefix = $1;
+ my $relpath = $2;
+ my $cleanrelpath;
+ foreach my $dir (split(/\//,$relpath.$path)) {
+ next if ($dir eq '.');
+ if ($dir eq '..') {
+ $cleanrelpath =~ s{([^/]+/)$}{};
+ } else {
+ $cleanrelpath .= $dir.'/';
+ }
+ }
+ $cleanrelpath =~ s{/$}{};
+ if ($cleanrelpath ne '') {
+ $src = $prefix.'/'.$cleanrelpath.'/'.$scriptname;
+ } else {
+ $src = $prefix.'/'.$scriptname;
+ }
+ if ($src ne '') {
+ &Apache::lonxml::extlink($src);
+ }
+ }
+ }
+ }
+ }
}
return $result;
}
@@ -122,7 +169,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();
@@ -134,29 +181,36 @@ sub end_script {
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
+ @Apache::scripttag::parser_env = @_;
my $result;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$parser);
if ( $target eq "modified" ) {
- $result=$token->[4].&Apache::edit::modifiedfield();
+ $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);
}
$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" ) {
+ 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);
$result=&Apache::edit::tag_start($target,$token,'Script With Display');
$result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
+ } elsif ($target eq 'meta') {
+ my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser);
}
return $result;
}
@@ -173,8 +227,9 @@ sub start_scriptlib {
my $result ='';
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
- $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze' || $target eq 'webgrade') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -183,7 +238,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 "";
@@ -201,9 +256,7 @@ sub start_scriptlib {
&Apache::edit::end_table();
}
if ($target eq "modified" ) {
- $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
- $result=$token->[4].&Apache::edit::modifiedfield($token);
- &Apache::lonxml::debug($result);
+ $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser);
}
return $result;
}
@@ -220,8 +273,9 @@ sub start_parserlib {
my $bodytext;
my $result ="";
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
- $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze' || $target eq 'webgrade') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -247,9 +301,7 @@ sub start_parserlib {
&Apache::edit::end_table();
}
if ($target eq "modified" ) {
- $bodytext=$$parser[$#$parser]->get_text("/parserlib");
- $result=$token->[4].&Apache::edit::modifiedfield($token);
- &Apache::lonxml::debug($result);
+ $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser);
}
return $result;
}
@@ -262,40 +314,159 @@ sub end_parserlib {
}
sub start_window {
- my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result = '';
- if ($target eq 'web') {
- &Apache::lonxml::startredirection;
- } elsif ($target eq 'tex') {
- $result = '\unskip\footnote{';
- }
- return $result;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result = '';
+ if ($target eq 'web' || $target eq 'webgrade') {
+ &Apache::lonxml::startredirection;
+ } elsif ($target eq 'tex') {
+ my $printtext=&Apache::lonxml::get_param('printtext',$parstack,$safeeval);
+ if ($printtext=~/\w/) {
+# If printtext is given, do not output any intervening information
+ &Apache::lonxml::startredirection;
+ } else {
+ $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:','height',$token,5);
+ $result.=&Apache::edit::text_arg('Width:','width',$token,5);
+ $result.=&Apache::edit::text_arg('Printed text (optional):','printtext',$token,20);
+ $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');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
}
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/\"/\"\;/g;
- $result = "newwindow $output