--- loncom/xml/scripttag.pm 2002/09/23 17:25:24 1.77 +++ loncom/xml/scripttag.pm 2003/06/18 20:36:32 1.98 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # '; + } + return ('','no'); +} + +sub end_LONCAPA_INTERNAL_LONHTTPD_PORT { + return ('','no'); } sub start_script { @@ -53,20 +85,26 @@ sub start_script { 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 'tex' || - $target eq 'grade' || $target eq 'answer') { - &Apache::run::run($bodytext,$safeeval); - if (($target eq 'answer') && ($Apache::lonhomework::viewgrades == 'F')) { - $Apache::lonxml::evaluate--; - $result.="newwindow
";
-	my $listing= &HTML::Entities::encode(&Apache::run::dump($target,$safeeval));
-	
-	$result.=$listing;
-	$result.= "
\');newWindow.document.close();void(0);\">Script Vars
"; - } + $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') && + ($ENV{'form.answer_output_mode'} ne 'tex') && + ($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:
"; @@ -76,7 +114,7 @@ sub start_script { } else { if ($target ne "meta") { $result = $token->[4]; - my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/script",$parser); $result.=$bodytext; } } @@ -93,7 +131,7 @@ sub end_script { return $token->[2]; } elsif ($target eq 'edit' ) { return &Apache::edit::end_table(); - } elsif (($target eq 'answer')) { + } elsif ($target eq 'answer') { $Apache::lonxml::evaluate++; } return ''; @@ -103,16 +141,21 @@ sub start_display { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result; - my $bodytext=&Apache::lonxml::get_all_text("/display",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/display",$parser); if ( $target eq "modified" ) { $result=$token->[4].&Apache::edit::modifiedfield(); } elsif ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer') { - $result=&Apache::run::run($bodytext,$safeeval); - if ($target eq 'grade' || $target eq 'answer' ) { - $result=''; # grade should produce no output - } + $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:
"; @@ -135,7 +178,8 @@ sub start_scriptlib { my $result =''; my $error=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') { + 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]); @@ -156,7 +200,8 @@ sub start_scriptlib { if ($target eq "edit" ) { $result= &Apache::edit::tag_start($target,$token,'New Script Functions'). - &Apache::edit::editline($token->[1],$bodytext,'',40). + &Apache::edit::editline($token->[1],$bodytext,'scriptlib',40). + &Apache::edit::browse(undef,'textnode'). $error.''. &Apache::edit::end_table(); } @@ -180,7 +225,8 @@ sub start_parserlib { my $bodytext; my $result =""; my $error=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || $target eq 'edit' || $target eq 'answer') { + 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]); @@ -236,8 +282,16 @@ sub end_window { my $result; if ($target eq 'web') { my $output=&Apache::lonxml::endredirection; - $output =~ s/\"/\"\;/g; - $result = "newwindow $output \');newWindow.document.close();void(0);\">*"; + $output =~ s/[\n\r]/ /g; +# $output = &HTML::Entities::encode($output,'<>&"\''); + $output =~ s/\'/\\\'/g; + my $linktext= &Apache::lonxml::get_param('linktext',$parstack,$safeeval); + if (!$linktext) { $linktext='*'; } + my $width= &Apache::lonxml::get_param('width',$parstack,$safeeval); + if (!$width) { $width='500'; } + my $height= &Apache::lonxml::get_param('height',$parstack,$safeeval); + if (!$height) { $height='200'; } + $result = "$linktext"; } elsif ($target eq 'tex') { $result = '}'; } else { @@ -253,7 +307,8 @@ sub start_import { $bodytext=Apache::run::evaluate($bodytext,$safeeval,$$parstack[$#$parstack]); - if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||$target eq 'tex') { + 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); @@ -269,10 +324,14 @@ sub start_import { 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); + push(@Apache::inputtags::importlist,$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
" @@ -341,7 +400,7 @@ sub start_standalone { my $result=''; if ($target eq 'web' ) { if ( $ENV{'request.course.id'} ) { - my $inside = &Apache::lonxml::get_all_text("/standalone",$$parser[-1]); + my $inside = &Apache::lonxml::get_all_text("/standalone",$parser); } else { $result='
'; } @@ -366,14 +425,14 @@ sub start_comment { my $result=''; if ($target eq 'edit') { $result=&Apache::edit::tag_start($target,$token); - my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4) } elsif ( $target eq 'modified') { $result=$token->[4].&Apache::edit::modifiedfield($token); - } elsif ( $target eq 'web' || $target eq 'tex' || - $target eq 'grade' || $target eq 'answer' || $target eq 'meta') { + } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || + $target eq 'answer' || $target eq 'meta' || $target eq 'analyze') { #normally throw away comments - my $bodytext=&Apache::lonxml::get_all_text("/comment",$$parser[$#$parser]); + my $bodytext=&Apache::lonxml::get_all_text("/comment",$parser); } return $result; } @@ -387,7 +446,7 @@ sub end_comment { sub xmlparse { my ($string) = @_; - &Apache::lonxml::debug("Got $string"); +# &Apache::lonxml::debug("Got $string"); my ($target,$token,$tagstack,$parstack,$oldparser,$safeeval,$style)= @Apache::scripttag::parser_env; my @parser;