--- loncom/xml/scripttag.pm 2001/05/04 21:17:24 1.37
+++ loncom/xml/scripttag.pm 2001/06/26 21:45:58 1.41
@@ -14,23 +14,21 @@ 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 ($target,$token,$tagstack,$parstack,$parser,$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;
+ $result=$token->[4].&Apache::edit::modifiedfield();
} 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.=&Apache::edit::editfield($token->[1],$bodytext);
+ #&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);
}
} else {
if ($target ne "meta") { $result = $token->[4]; }
@@ -39,25 +37,21 @@ sub start_script {
}
sub end_script {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
+ my ($target,$token,$tagstack,$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]; }
+ if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
return '';
}
sub start_display {
- my ($target,$token,$parstack,$parser,$safeeval)=@_;
- my $args ='';
- if ( $#$parstack > -1 ) {
- $args=$$parstack[$#$parstack];
- }
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+
my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
-
+
if ( $target eq "modified" ) {
}
my $result=&Apache::run::run($bodytext,$safeeval);
@@ -68,16 +62,17 @@ 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 {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext;
my $result ='';
my $error='';
@@ -102,8 +97,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" ) {
@@ -115,14 +110,14 @@ sub start_scriptlib {
}
sub end_scriptlib {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result='';
# if ($target eq "edit" ) { $result=" "; }
return $result;
}
sub start_parserlib {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext;
my $result ="";
my $error='';
@@ -147,8 +142,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" ) {
@@ -160,17 +155,16 @@ sub start_parserlib {
}
sub end_parserlib {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$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;
}
sub start_window {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target eq 'web') {
&Apache::lonxml::startredirection;
@@ -181,7 +175,7 @@ sub start_window {
}
sub end_window {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result;
if ($target eq 'web') {
my $output=&Apache::lonxml::endredirection;
@@ -196,7 +190,7 @@ sub end_window {
}
sub start_import {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $bodytext=$$parser[$#$parser]->get_text("/import");
my $result ="";
@@ -214,7 +208,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 '';
@@ -224,7 +218,7 @@ sub end_import {
}
sub start_meta {
- my ($target,$token,$parstack,$parser,$safeeval,$style)=@_;
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
my $result = '';
if ($target ne 'meta') {
$result = &Apache::lonxml::get_all_text("/meta",$$parser[$#$parser]);
@@ -238,23 +232,5 @@ sub start_meta {
sub end_meta {
}
-sub getfilenothere {
- my ($filename) = @_;
- my $a="";
-
- $filename=~ s/^\s*(\S+)\s*$/$1/; ## strip off leading and trailing spaces
- $filename="/home/httpd/html/res".$filename;
- if (! -e $filename ) {
- &Apache::lonnet::subscribe($filename);
- &Apache::lonnet::repcopy($filename);
- }
- if (! -e $filename ) { return -1; };
- my $fh=Apache::File->new($filename);
- while (<$fh>) {
- $a .=$_;
- }
- return $a
-}
-
1;
__END__