--- loncom/xml/scripttag.pm 2001/03/27 16:56:56 1.35
+++ loncom/xml/scripttag.pm 2001/07/11 14:44:37 1.45
@@ -6,30 +6,31 @@ package Apache::scripttag;
use strict;
use Apache::lonnet;
+use Apache::style;
sub BEGIN {
&Apache::lonxml::register('Apache::scripttag',('script','scriptlib',
'parserlib','import',
- 'window','display'));
+ 'window','display',
+ 'storetc','physnet'));
}
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].&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.=&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]; }
@@ -38,25 +39,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);
@@ -67,78 +64,119 @@ 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,$tagstack,$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='
Errors | Unable to find '.$location.' | '."\n";
+ } else {
+ &Apache::lonxml::error(" Unable to find $location for scriptlib");
+ return "";
+ }
+ }
+ &Apache::run::run($script,$safeeval);
+ #&Apache::lonxml::debug("ran $bodytext:
".&Apache::lonnet::getfile($bodytext)."
");
}
- &Apache::run::run($script,$safeeval);
- #&Apache::lonxml::debug("ran $bodytext:
".&Apache::lonnet::getfile($bodytext)."
");
-
if ($target eq "edit" ) {
- $result.=&editfield($token->[1],$bodytext);
+ $result=
+ &Apache::edit::tag_start($target,$token).
+ &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1).
+ $error;
+ }
+ if ($target eq "modified" ) {
+ $bodytext=$$parser[$#$parser]->get_text("/scriptlib");
+ $result=&Apache::edit::modifiedfield($token);
+ &Apache::lonxml::debug($result);
}
return $result;
}
-sub end_scriptlib {}
+sub end_scriptlib {
+ 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 $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $bodytext;
my $result ="";
-
- $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
- $$parstack[$#$parstack]);
- my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
- $bodytext);
- my $styletext=&Apache::lonnet::getfile($location);
- #&Apache::lonxml::debug("found :$bodytext: in :$location: with :$styletext:");
- if ($styletext == -1) {
- &Apache::lonxml::error(" Unable to find $location for parserlib");
- return "";
+ my $error='';
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+ $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+ $bodytext=&Apache::run::evaluate($bodytext,$safeeval,
+ $$parstack[$#$parstack]);
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],
+ $bodytext);
+ my $styletext=&Apache::lonnet::getfile($location);
+ #&Apache::lonxml::debug("found :$bodytext: in :$location: with :$styletext:");
+ if ($styletext == -1) {
+ if ($target eq 'edit') {
+ $error='
Errors | Unable to find '.$location.' | '."\n";
+ } else {
+ &Apache::lonxml::error(" Unable to find $location for parserlib");
+ return "";
+ }
+ }
+ %$style = ( %$style , &Apache::style::styleparser($target,$styletext));
}
- %$style = ( %$style , &Apache::style::styleparser($target,$styletext));
-
if ($target eq "edit" ) {
- $result=&editfield($token->[1],$bodytext);
+ $result=
+ &Apache::edit::tag_start($target,$token).
+ &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1).
+ $error;
+ }
+ if ($target eq "modified" ) {
+ $bodytext=$$parser[$#$parser]->get_text("/parserlib");
+ $result=&Apache::edit::modifiedfield($token);
+ &Apache::lonxml::debug($result);
}
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;
}
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;
} elsif ($target eq 'tex') {
- $result = '\footnote{';
+ $result = '\unskip\footnote{';
}
return $result;
}
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;
@@ -153,7 +191,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 ="";
@@ -171,17 +209,18 @@ sub start_import {
&Apache::lonxml::newparser($parser,\$file,$dir);
if ($target eq "edit" ) {
- $result.=&editfield($token->[1],$bodytext);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
$result.="Clickhere to edit
"
}
return '';
}
sub end_import {
+ return '';
}
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]);
@@ -195,35 +234,39 @@ sub start_meta {
sub end_meta {
}
-sub editfield {
- my ($tag,$data)=@_;
-
- my $count=0;
- my $maxlength=-1;
- map { $count++;
- if (length($_) > $maxlength) { $maxlength = length ($_); }
- } split ("\n", $data);
-
- return "
\n<$tag>
\n
\n</$tag>
\n";
-}
-
-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
+sub start_storetc {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result = '';
+ &Apache::lonxml::startredirection;
+ return $result;
}
+sub end_storetc {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $result;
+ my $output=&Apache::lonxml::endredirection;
+ $output =~ s/\"/\"\;/g;
+ $result = "{\bf $output.}}\write\tcfile{\protect\tcpc{ $output.}{\the\value{relpage}}}";
+ return $result;
+}
+
+
+sub start_physnet {
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
+ my $bodytext = '/msu/physnet/cbi.sty';
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ my $cbistyletext=&Apache::lonnet::getfile($location);
+
+ %$style = (%$style,&Apache::style::styleparser($target,$cbistyletext));
+ if ( defined($$style{'physnet'}) ) {
+ &Apache::lonxml::newparser($parser,\$$style{'physnet'});
+ }
+ return "";
+}
+
+sub end_physnet {
+}
+
+
1;
__END__