--- loncom/xml/scripttag.pm 2003/01/13 22:18:34 1.84 +++ loncom/xml/scripttag.pm 2004/10/08 13:43:31 1.119 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # '; + } + return ('','no'); +} + +sub end_LONCAPA_INTERNAL_LONHTTPD_PORT { return ('','no'); } @@ -63,36 +102,45 @@ 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); if ( $target eq "modified" ) { - $result=$token->[4].&Apache::edit::modifiedfield(); + $result=$token->[4].&Apache::edit::modifiedfield('/script',$parser); } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'answer' || $target eq 'analyze' ) { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); 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')) { + if (($target eq 'answer') && + ($ENV{'form.answer_output_mode'} ne 'tex') && + ($Apache::lonhomework::viewgrades == 'F')) { $Apache::lonxml::evaluate--; - $result.=" function LONCAPA_scriptvars_".$uname."_".$udom."_"."$Apache::lonxml::curdepth() {newWindow=open('','new_W','width=500,height=500,scrollbars=1,resizable=yes');newWindow.$windowopen;newWindow.document.writeln('Script Vars"; + my $listing=&Apache::run::dump($target,$safeeval); + $listing=~s/\'/\\\'/g; + $listing=~s/\n/\\n/g; + $listing=~s/\r/\\r/g; $result.=$listing; - $result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars"; + $result.= "');newWindow.document.close();}Script Vars"; } } elsif ($target eq "edit" ) { #&Apache::run::run($bodytext,$safeeval); #$result=" <$token->[1]> output: $bodytextSource:"; - $result=&Apache::edit::tag_start($target,$token,'Script'); - $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4); + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); + $result=&Apache::edit::tag_start($target,$token,'Script'); + $result.=&Apache::edit::editfield($token->[1],$bodytext,'',80,4); + } elsif ($target eq 'meta') { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); } } else { - if ($target ne "meta") { - $result = $token->[4]; - my $bodytext=&Apache::lonxml::get_all_text("/script",$$parser[$#$parser]); - $result.=$bodytext; - } + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/script",$parser); + if ($target ne "meta" && $target ne 'tex') { + $result = $token->[4]; + $result.=$bodytext; + } } return $result; } @@ -103,7 +151,7 @@ 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") { + if ($type ne "loncapa/perl" && $target ne 'tex') { return $token->[2]; } elsif ($target eq 'edit' ) { return &Apache::edit::end_table(); @@ -115,29 +163,36 @@ sub end_script { sub start_display { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - + @Apache::scripttag::parser_env = @_; my $result; - my $bodytext=&Apache::lonxml::get_all_text("/display",$parser); if ( $target eq "modified" ) { - $result=$token->[4].&Apache::edit::modifiedfield(); + $result=$token->[4].&Apache::edit::modifiedfield("/display",$parser); } elsif ( $target eq 'web' || $target eq 'tex' || $target eq 'grade' || $target eq 'answer' || $target eq 'analyze') { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); 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 + # grade/answer/analyxe should produce no output but if we + # are redirecting, the redirecter should know what to do + # with the output + if (!$Apache::lonxml::redirection) { $result=''; } } + $Apache::lonxml::post_evaluate=0; } elsif ($target eq "edit" ) { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); #$result = # " <$token->[1]> output: $bodytextSource:"; #$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) + } elsif ($target eq 'meta') { + my $bodytext=&Apache::lonxml::get_all_text_unbalanced("/display",$parser); } return $result; } @@ -154,8 +209,9 @@ sub start_scriptlib { my $result =''; my $error=''; - if ($target eq 'web' || $target eq 'grade' || $target eq 'meta' || - $target eq 'edit' || $target eq 'answer' || $target eq 'analyze') { + if ($target eq 'web' || $target eq 'tex' || $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]); @@ -182,9 +238,7 @@ sub start_scriptlib { &Apache::edit::end_table(); } if ($target eq "modified" ) { - $bodytext=$$parser[$#$parser]->get_text("/scriptlib"); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + $result=$token->[4].&Apache::edit::modifiedfield("/scriptlib",$parser); } return $result; } @@ -201,8 +255,9 @@ 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' || $target eq 'analyze') { + if ($target eq 'web' || $target eq 'tex' || $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]); @@ -228,9 +283,7 @@ sub start_parserlib { &Apache::edit::end_table(); } if ($target eq "modified" ) { - $bodytext=$$parser[$#$parser]->get_text("/parserlib"); - $result=$token->[4].&Apache::edit::modifiedfield($token); - &Apache::lonxml::debug($result); + $result=$token->[4].&Apache::edit::modifiedfield("/parserlib",$parser); } return $result; } @@ -243,14 +296,25 @@ sub end_parserlib { } sub start_window { - my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; - my $result = ''; - if ($target eq 'web') { - &Apache::lonxml::startredirection; - } elsif ($target eq 'tex') { - $result = '\unskip\footnote{'; - } - return $result; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_; + my $result = ''; + if ($target eq 'web') { + &Apache::lonxml::startredirection; + } elsif ($target eq 'tex') { + $result = '\unskip\footnote{'; + } elsif ($target eq 'edit') { + $result.=&Apache::edit::tag_start($target,$token); + $result.=&Apache::edit::text_arg('Text of Link:','linktext',$token,70); + $result.=&Apache::edit::text_arg('Height:','width',$token,5); + $result.=&Apache::edit::text_arg('Width:','height',$token,5); + $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row(); + } elsif ($target eq 'modified') { + my $constructtag=&Apache::edit::get_new_args($token,$parstack, + $safeeval,'linttext', + 'width','height'); + if ($constructtag) { $result=&Apache::edit::rebuild_tag($token); } + } + return $result; } sub end_window { @@ -258,8 +322,16 @@ sub end_window { my $result; if ($target eq 'web') { my $output=&Apache::lonxml::endredirection; - $output =~ s/\"/\"\;/g; - $result = "newwindow $output
"; + my $listing=&Apache::run::dump($target,$safeeval); + $listing=~s/\'/\\\'/g; + $listing=~s/\n/\\n/g; + $listing=~s/\r/\\r/g; $result.=$listing; - $result.= "</pre></body></html>\');newWindow.document.close();void(0);\">Script Vars