--- loncom/xml/scripttag.pm 2001/07/06 21:54:10 1.43
+++ loncom/xml/scripttag.pm 2003/02/24 23:32:32 1.86
@@ -1,39 +1,114 @@
# The LearningOnline Network with CAPA
# ';
+ }
+ return ('','no');
+}
+
+sub end_LONCAPA_INTERNAL_LONHTTPD_PORT {
+ return ('','no');
}
sub start_script {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ @Apache::scripttag::parser_env = @_;
my $result='';
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]);
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$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 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'analyze' ) {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ &Apache::run::run($bodytext,$safeeval);
+ if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) {
+ $Apache::lonxml::evaluate--;
+ $result.="Script Vars
";
+ }
} elsif ($target eq "edit" ) {
#&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);
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4);
}
} else {
- if ($target ne "meta") { $result = $token->[4]; }
+ if ($target ne "meta") {
+ $result = $token->[4];
+ my $bodytext=&Apache::lonxml::get_all_text("/script",$parser);
+ $result.=$bodytext;
+ }
}
return $result;
}
@@ -44,33 +119,49 @@ sub end_script {
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(); }
+ if ($type ne "loncapa/perl") {
+ return $token->[2];
+ } elsif ($target eq 'edit' ) {
+ return &Apache::edit::end_table();
+ } elsif ($target eq 'answer') {
+ $Apache::lonxml::evaluate++;
+ }
return '';
}
sub start_display {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
- my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]);
+ my $result;
+ my $bodytext=&Apache::lonxml::get_all_text("/display",$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.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+ $result=$token->[4].&Apache::edit::modifiedfield();
+ } elsif ( $target eq 'web' || $target eq 'tex' ||
+ $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'analyze') {
+ if (!$Apache::lonxml::default_homework_loaded) {
+ &Apache::lonxml::default_homework_load($safeeval);
+ }
+ $result=&Apache::run::run($bodytext,$safeeval);
+ if ($target eq 'grade' || $target eq 'answer' ||
+ $target eq 'analyze') {
+ $result=''; # grade should produce no output
+ }
+ } elsif ($target eq "edit" ) {
+ #$result =
+ # "
<$token->[1]> output:
$bodytext
Source:
";
+ #$result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
+ $result=&Apache::edit::tag_start($target,$token,'Script With Display');
+ $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,1)
}
return $result;
}
sub end_display {
- return ''
+ my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
+ if ($target eq 'edit' ) { return &Apache::edit::end_table(); }
+ return '';
}
sub start_scriptlib {
@@ -79,7 +170,8 @@ sub start_scriptlib {
my $result ='';
my $error='';
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
+ $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -99,13 +191,15 @@ sub start_scriptlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$bodytext,'New Script Functions',40,1).
- $error;
+ &Apache::edit::tag_start($target,$token,'New Script Functions').
+ &Apache::edit::editline($token->[1],$bodytext,'scriptlib',40).
+ &Apache::edit::browse(undef,'textnode').
+ $error.''.
+ &Apache::edit::end_table();
}
if ($target eq "modified" ) {
$bodytext=$$parser[$#$parser]->get_text("/scriptlib");
- $result=&Apache::edit::modifiedfield($token);
+ $result=$token->[4].&Apache::edit::modifiedfield($token);
&Apache::lonxml::debug($result);
}
return $result;
@@ -113,9 +207,9 @@ sub start_scriptlib {
sub end_scriptlib {
my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
- my $result='';
-# if ($target eq "edit" ) { $result=" "; }
- return $result;
+ my @result;
+ if ($target eq "edit" ) { $result[1]='no'; }
+ return @result;
}
sub start_parserlib {
@@ -123,8 +217,8 @@ sub start_parserlib {
my $bodytext;
my $result ="";
my $error='';
-
- if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit') {
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' ||
+ $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
$bodytext=&Apache::run::evaluate($bodytext,$safeeval,
$$parstack[$#$parstack]);
@@ -144,13 +238,14 @@ sub start_parserlib {
}
if ($target eq "edit" ) {
$result=
- &Apache::edit::tag_start($target,$token).
- &Apache::edit::editfield($token->[1],$bodytext,"New Tag Definitions",40,1).
- $error;
+ &Apache::edit::tag_start($target,$token,'New Tag Definitions').
+ &Apache::edit::editline($token->[1],$bodytext,'',40).
+ $error.''.
+ &Apache::edit::end_table();
}
if ($target eq "modified" ) {
$bodytext=$$parser[$#$parser]->get_text("/parserlib");
- $result=&Apache::edit::modifiedfield($token);
+ $result=$token->[4].&Apache::edit::modifiedfield($token);
&Apache::lonxml::debug($result);
}
return $result;
@@ -158,11 +253,9 @@ sub start_parserlib {
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;
+ my @result;
+ if ($target eq "edit" ) { $result[1]='no'; }
+ return @result;
}
sub start_window {
@@ -197,41 +290,55 @@ sub start_import {
my $result ="";
$bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]);
- my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
- my $file=&Apache::lonnet::getfile($location);
- if ($file == -1) {
- &Apache::lonxml::error(" Unable to find $bodytext $location for import");
- return "";
- }
- my $dir=$location;
- $dir=~s:/[^/]*$::;
-# &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
- &Apache::lonxml::newparser($parser,\$file,$dir);
+ if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
+ $target eq 'tex' || $target eq 'analyze' ) {
+ # FIXME this probably needs to be smart about construction vs.
+ # non construction space.
+ my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ my $file=&Apache::lonnet::getfile($location);
+ if ($file == -1) {
+ &Apache::lonxml::error(" Unable to find $bodytext as $location for import");
+ return "";
+ }
- if ($target eq "edit" ) {
- $result.=&Apache::edit::editfield($token->[1],$bodytext,'',40,1);
- $result.="Clickhere to edit
"
+ my $dir=$location;
+ $dir=~s:/[^/]*$::;
+ # &Apache::lonxml::debug("directory $dir $location file $file \nEND\n");
+ my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ if (!$id) { $id=$Apache::lonxml::curdepth; }
+ push(@Apache::inputtags::import,$id);
+ &Apache::lonxml::newparser($parser,\$file,$dir);
+ } elsif ($target eq "edit" ) {
+ $result.=&Apache::edit::tag_start($target,$token);
+ $result.=&Apache::edit::editline($token->[1],$bodytext,'',40);
+ $result.=&Apache::edit::browse(undef,'textnode');
+ #FIXME this need to convert $bodytext to be a contruction space reference
+ #my $location=&Apache::lonnet::filelocation($Apache::lonxml::pwd['-1'],$bodytext);
+ #$result.="Clickhere to edit
"
+ } elsif ($target eq 'modified') {
+ $bodytext=$$parser[$#$parser]->get_text("/import");
+ $result=$token->[4].&Apache::edit::modifiedfield($token);
+ &Apache::lonxml::debug($result);
+ } elsif ($target eq 'meta') {
+ my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
+ $result.='
'; + } + } + return $result; +} + +sub end_standalone { + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result=''; + if ($target eq 'web' ) { + if ( $ENV{'request.course.id'} ) { + } else { + $result=' |