--- loncom/xml/scripttag.pm 2001/05/04 21:17:24 1.37
+++ loncom/xml/scripttag.pm 2001/05/31 22:38:36 1.39
@@ -15,11 +15,9 @@ 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]);
@@ -30,7 +28,7 @@ sub start_script {
} elsif ($target eq "edit" ) {
&Apache::run::run($bodytext,$safeeval);
$result="
<$token->[1]> output:
$bodytext
Source:
";
- $result.=&Apache::edit::editfield($token->[1],$bodytext);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',50,5);
}
} else {
if ($target ne "meta") { $result = $token->[4]; }
@@ -41,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]; }
@@ -52,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);
@@ -68,12 +61,13 @@ sub start_display {
if ($target eq "edit" ) {
$result =
"
<$token->[1]> output:
$bodytext
Source:
";
- $result.=&Apache::edit::editfield($token->[1],$bodytext);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
}
return $result;
}
sub end_display {
+ return ''
}
sub start_scriptlib {
@@ -102,8 +96,8 @@ sub start_scriptlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($token->[1]).
- &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions').
+ &Apache::edit::tag_start($target,$token).
+ &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1).
$error;
}
if ($target eq "modified" ) {
@@ -147,8 +141,8 @@ sub start_parserlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($token->[1]).
- &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions").
+ &Apache::edit::tag_start($target,$token).
+ &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1).
$error;
}
if ($target eq "modified" ) {
@@ -163,8 +157,7 @@ sub end_parserlib {
my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
# if ($target eq "edit" ) {
-# $result=&Apache::edit::tag_end($target,$token,$parstack,$parser,
-# $safeeval,$style);
+# $result=&Apache::edit::tag_end($target,$token);
# }
return $result;
}
@@ -214,7 +207,7 @@ sub start_import {
&Apache::lonxml::newparser($parser,\$file,$dir);
if ($target eq "edit" ) {
- $result.=&Apache::edit::editfield($token->[1],$bodytext);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
$result.="Clickhere to edit
"
}
return '';