--- loncom/xml/scripttag.pm 2001/03/27 16:56:56 1.35
+++ loncom/xml/scripttag.pm 2001/05/31 22:38:36 1.39
@@ -15,21 +15,20 @@ sub BEGIN {
sub start_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
my $result='';
- #&Apache::lonxml::debug("found type of $type");
+ 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].$bodytext;
} elsif ( $target eq "web" || $target eq "grade" ) {
&Apache::run::run($bodytext,$safeeval);
} elsif ($target eq "edit" ) {
&Apache::run::run($bodytext,$safeeval);
$result="
<$token->[1]> output:
$bodytext
Source:
";
- $result.=&editfield($token->[1],$bodytext);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,5);
}
} else {
if ($target ne "meta") { $result = $token->[4]; }
@@ -40,9 +39,7 @@ sub start_script {
sub end_script {
my ($target,$token,$parstack,$parser,$safeeval)=@_;
if ( $target eq "meta" ) { return ''; }
- my $args ='';
- if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
- my $type = &Apache::run::run("{$args;".'return $type}',$safeeval);
+ 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]; }
@@ -51,12 +48,9 @@ sub end_script {
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);
@@ -67,63 +61,105 @@ sub start_display {
if ($target eq "edit" ) {
$result =
"
<$token->[1]> output:
$bodytext
Source:
";
- $result.=&editfield($token->[1],$bodytext);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
}
return $result;
}
sub end_display {
+ return ''
}
sub start_scriptlib {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
- my $result ="";
-
- $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
- $$parstack[$#$parstack]);
- my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
- $bodytext);
- my $script=&Apache::lonnet::getfile($location);
- if ($script == -1) {
- &Apache::lonxml::error(" Unable to find $location for scriptlib");
- return "";
+ my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my $bodytext;
+ my $result ='';
+ my $error='';
+
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+ $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
+ $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+ $$parstack[$#$parstack]);
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
+ $bodytext);
+ my $script=&Apache::lonnet::getfile($location);
+ if ($script == -1) {
+ if ($target eq 'edit') {
+ $error='