--- loncom/xml/scripttag.pm 2001/07/09 04:10:30 1.44
+++ loncom/xml/scripttag.pm 2005/02/27 17:26:09 1.125
@@ -1,39 +1,150 @@
# The LearningOnline Network with CAPA
# ';
+ }
+ return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
+ return ('','no');
}
sub start_script {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ @Apache::scripttag::parser_env = @_;
my $result='';
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[$#$parser]);
if ( $target eq "modified" ) {
- $result=$token->[4].&Apache::edit::modifiedfield();
- } elsif ( $target eq "web" || $target eq "grade" ) {
- &Apache::run::run($bodytext,$safeeval);
+ $result=$token->[4].&Apache::edit::modifiedfield('/script',$parser);
+ } elsif ( $target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $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') &&
+ ($Apache::lonhomework::viewgrades == 'F')) {
+ $Apache::lonxml::evaluate--;
+ my (undef,undef,$udom,$uname)=&Apache::lonxml::whichuser();
+ my $windowopen=&Apache::lonhtmlcommon::javascript_docopen();
+ $result.="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,'',50,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_unbalanced("/script",$parser);
+ if ($target ne "meta" && $target ne 'tex') {
+ $result = $token->[4];
+ $result.=$bodytext;
+ }
}
return $result;
}
@@ -44,33 +155,56 @@ 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") { return $token->[2]; }
- if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+ if ($type ne "loncapa/perl" && $target ne 'tex') {
+ return $token->[2];
+ } elsif ($target eq 'edit' ) {
+ return &Apache::edit::end_table();
+ } elsif ($target eq 'answer') {
+ $Apache::lonxml::evaluate++;
+ }
return '';
}
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
-
- my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+ @Apache::scripttag::parser_env = @_;
+ my $result;
if ( $target eq "modified" ) {
- }
- my $result=&Apache::run::run($bodytext,$safeeval);
- if ($target eq 'grade' ) {
- # grade should produce no output
- $result='';
- }
- if ($target eq "edit" ) {
- $result =
- "
<$token->[1]> output:
$bodytext
Source:
";
- $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+ $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser);
+ } elsif ( $target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $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') {
+ # 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;
}
sub end_display {
- return ''
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+ return '';
}
sub start_scriptlib {
@@ -79,7 +213,9 @@ sub start_scriptlib {
my $result ='';
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -99,23 +235,23 @@ sub start_scriptlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1).
- $error;
+ &Apache::edit::tag_start($target,$token,'New Script Functions').
+ &Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
+ &Apache::edit::browse(undef,'textnode').
+ $error.''.
+ &Apache::edit::end_table();
}
if ($target eq "modified" ) {
- $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
- $result=&Apache::edit::modifiedfield($token);
- &Apache::lonxml::debug($result);
+ $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser);
}
return $result;
}
sub end_scriptlib {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result='';
-# if ($target eq "edit" ) { $result=" "; }
- return $result;
+ my @result;
+ if ($target eq "edit" ) { $result[1]='no'; }
+ return @result;
}
sub start_parserlib {
@@ -123,8 +259,9 @@ sub start_parserlib {
my $bodytext;
my $result ="";
my $error='';
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+ if ($target eq 'web' || $target eq 'tex' || $target eq 'grade' ||
+ $target eq 'meta' || $target eq 'edit' || $target eq 'answer' ||
+ $target eq 'analyze') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -144,36 +281,44 @@ sub start_parserlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1).
- $error;
+ &Apache::edit::tag_start($target,$token,'New Tag Definitions').
+ &Apache::edit::editline($token->[1],$bodytext,'',40).
+ $error.''.
+ &Apache::edit::end_table();
}
if ($target eq "modified" ) {
- $bodytext=$$parser[$#$parser]->get_text("/parserlib");
- $result=&Apache::edit::modifiedfield($token);
- &Apache::lonxml::debug($result);
+ $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser);
}
return $result;
}
sub end_parserlib {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result='';
-# if ($target eq "edit" ) {
-# $result=&Apache::edit::tag_end($target,$token);
-# }
- return $result;
+ my @result;
+ if ($target eq "edit" ) { $result[1]='no'; }
+ return @result;
}
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') {
+ &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::end_row().&Apache::edit::start_spanning_row();
+ } elsif ($target eq 'modified') {
+ my $constructtag=&Apache::edit::get_new_args($token,$parstack,
+ $safeeval,'linttext',
+ 'width','height');
+ if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); }
+ }
+ return $result;
}
sub end_window {
@@ -181,8 +326,16 @@ sub end_window {
my $result;
if ($target eq 'web') {
my $output=&Apache::lonxml::endredirection;
- $output =~ s/\"/\"\;/g;
- $result = "newwindow $output