--- loncom/xml/scripttag.pm 2000/10/05 19:31:54 1.18
+++ loncom/xml/scripttag.pm 2000/12/05 22:07:26 1.26
@@ -9,10 +9,10 @@ use Apache::lonnet;
sub BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
- 'parserlib','import'));
+ 'parserlib','import',
+ 'footnote','display'));
}
-$Apache::scripttag::SCRIPT_RESULT='';
sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $args ='';
@@ -20,32 +20,57 @@ sub start_script {
$args=$$parstack[$#$parstack];
}
my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+ my $result='';
#&Apache::lonxml::debug("found type of $type");
- $Apache::scripttag::SCRIPT_RESULT='';
if ($type eq "loncapa/perl") {
- $safeeval->share('$SCRIPT_RESULT');
- my $bodytext=&Apache::lonxml::get_all_text("script",$$parser[$#$parser]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]);
if ( $target eq "modified" ) {
}
&Apache::run::run($bodytext,$safeeval);
if ($target eq "edit" ) {
- $Apache::scripttag::SCRIPT_RESULT =
- "
<$token->[1]> output:
$bodytext
Source:
";
- $Apache::scripttag::SCRIPT_RESULT.=&editfield($token->[1],$bodytext);
+ $result="
<$token->[1]> output:
$bodytext
Source:
";
+ $result.=&editfield($token->[1],$bodytext);
}
} else {
- $Apache::scripttag::SCRIPT_RESULT = $token->[4];
+ $result = $token->[4];
}
- return $Apache::scripttag::SCRIPT_RESULT;
+ return $result;
}
sub end_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
+# return '';
return $token->[2];
}
+sub start_display {
+ my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my $args ='';
+ if ( $#$parstack > -1 ) {
+ $args=$$parstack[$#$parstack];
+ }
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+
+ 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.=&editfield($token->[1],$bodytext);
+ }
+ return $result;
+}
+
+sub end_display {
+}
+
sub start_scriptlib {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
@@ -96,6 +121,22 @@ sub start_parserlib {
sub end_parserlib {
}
+sub start_footnote {
+ my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my $result = '';
+ $Apache::lonxml::redirection = 0;
+ return $result;
+}
+
+sub end_footnote {
+ my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ $Apache::lonxml::outputstack =~ s/\"/\"\;/g;
+ my $result = "newwindow $Apache::lonxml::outputstack