--- loncom/homework/structuretags.pm 2001/08/22 19:21:36 1.66 +++ loncom/homework/structuretags.pm 2002/08/26 20:29:30 1.106 @@ -1,5 +1,30 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document +# +# $Id: structuretags.pm,v 1.106 2002/08/26 20:29:30 sakharuk Exp $ +# +# Copyright Michigan State University Board of Trustees +# +# This file is part of the LearningOnline Network with CAPA (LON-CAPA). +# +# LON-CAPA is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# LON-CAPA is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with LON-CAPA; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# /home/httpd/html/adm/gpl.txt +# +# http://www.lon-capa.org/ +# # 2/19 Guy # 6/26/2001 fixed extra web display at end of tags # 8/17,8/18,8/20 Gerd Kortemeyer @@ -8,8 +33,9 @@ package Apache::structuretags; use strict; use Apache::lonnet; +use Apache::File(); -sub BEGIN { +BEGIN { &Apache::lonxml::register('Apache::structuretags',('block','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','startouttext','endouttext')); # &Apache::lonxml::register_insert('problem','',('part','postanswerdate','preduedate')) } @@ -31,7 +57,7 @@ sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $bodytext=&Apache::lonxml::get_all_text("/tex",$$parser[$#$parser]); if ($target eq 'tex') { - return $bodytext + return $bodytext.' '; } return ''; } @@ -42,32 +68,115 @@ sub end_tex { sub page_start { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result=&Apache::londefdef::start_html($target,$token,$tagstack,$parstack,$parser,$safeeval); - my $head_tag_start=''.&Apache::lonxml::registerurl(); - my $body_tag_start=''; + } + return ($result,$head_tag_start,$body_tag_start,$form_tag_start); +} + +sub get_resource_name { + my ($parstack,$safeeval)=@_; + my $name=&Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + return $name; +} + +sub setup_rndseed { + my ($safeeval)=@_; + my $rndseed; + if ($ENV{'request.state'} eq "construct") { + $rndseed=$ENV{'form.rndseed'}; + if (!$rndseed) { + $rndseed=time; + $ENV{'form.rndseed'}=$rndseed; } + &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); } - $body_tag_start.='>'; - return ($result,$head_tag_start,$body_tag_start); + return $rndseed; +} + +sub problem_edit_header { + return ' + + + +
+ +
+ '; +} + +sub problem_edit_footer { + return '
+ '; +} + +sub problem_web_to_edit_header { + my ($rndseed)=@_; + my $result.=' + + + Random Seed: + + + Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.

- -

- + + + +
ENDCHECKOUT } @@ -109,13 +223,26 @@ ENDCHECKOUT sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + # meta is called from lonpublisher, which doesn't uses the normal + # lonhomework method of parsing the file which means that inputtags + # won't get reset + if ( $Apache::inputtags::part ne '' && $target != 'meta' ) { + &Apache::lonxml::error('Only one problem allowed in a .problem file'); + my $bodytext=&Apache::lonxml::get_all_text("/problem",$$parser[-1]); + return ''; + } #intialize globals $Apache::inputtags::part='0'; @Apache::inputtags::responselist = (); @Apache::inputtags::previous=(); - &initialize_storage(); - $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); - &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); + if ($target ne 'analyze') { + &initialize_storage(); + if ($target eq 'web') { + &Apache::lonhomework::showhash(%Apache::lonhomework::history); + } + $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type'); + &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:"); + } if ($Apache::lonhomework::type eq '') { my $uri=$ENV{'request.uri'}; if ($uri=~/\.(\w+)$/) { @@ -127,27 +254,30 @@ sub start_problem { } } -#added vars to the scripting enviroment + #added vars to the scripting enviroment my $expression='$external::part='.$Apache::inputtags::part.';'; &Apache::run::run($expression,$safeeval); my $status; my $accessmsg; #should get back a or the neccesary stuff to start XML/MathML - my ($result,$head_tag_start,$body_tag_start)= + my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); + if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) { $result = '';} - if ($Apache::lonhomework::type eq 'exam') { - if ($target eq 'web') { - my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; - if (($ENV{'form.doescheckout'}) && (!$token)) { - $token=&Apache::lonxml::maketoken(); - $Apache::lonhomework::history{"resource.0.outtoken"}=$token; - } - $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { + #handle exam checkout + if ($Apache::lonhomework::type eq 'exam') { + my $token=$Apache::lonhomework::history{"resource.0.outtoken"}; + if (($ENV{'form.doescheckout'}) && (!$token)) { + $token=&Apache::lonxml::maketoken(); + $Apache::lonhomework::history{"resource.0.outtoken"}=$token; } - } - if ($target eq 'web' || $target eq 'grade') { + $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token); + } + + #handle rand seed in construction space + my $rndseed=&setup_rndseed($safeeval); ($status,$accessmsg) = &Apache::lonhomework::check_access('0'); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -166,81 +296,144 @@ sub start_problem { } elsif ($status eq 'UNCHECKEDOUT') { $msg.=&checkout_msg; } - return $result.$msg.'
'; + $result.=$msg.'
'; } - } - } - if ($target eq 'web') { - my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); - if ($name eq '') { - $name=&Apache::lonnet::EXT('resource.title'); - if ($name eq 'con_lost') { $name = ''; } - } - $Apache::lonhomework::name=$name; - if ($status eq 'CAN_ANSWER') { - # create a page header and exit - $result.="$head_tag_start$name\n - $body_tag_start\n -
". + } elsif ($target eq 'web') { + my $name= &get_resource_name($parstack,$safeeval); + if ($status eq 'CAN_ANSWER') { + # create a page header and exit + $result.="$head_tag_start$name + $body_tag_start \n $form_tag_start". ''; - if ($ENV{'request.state'} eq "construct") { - $result.=' -
'; - } - # if we are viewing someone else preserve that info - if (defined $ENV{'form.grade_symb'}) { - foreach my $field ('symb','courseid','domain','username') { - $result .= ''."\n"; + if ($ENV{'request.state'} eq "construct") { + $result.= &problem_web_to_edit_header($rndseed); + } + # if we are viewing someone else preserve that info + if (defined $ENV{'form.grade_symb'}) { + foreach my $field ('symb','courseid','domain','username') { + $result .= ''."\n"; + } } + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' + || $status eq 'CLOSED') { + $result.=$head_tag_start. + "$name\n$body_tag_start\n"; } - return $result; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || $status eq 'CLOSED') { - return $result.$head_tag_start."$name\n$body_tag_start\n"; + } elsif ($target eq 'tex') { + my $name= &Apache::lonxml::get_param('name',$parstack,$safeeval); + if ($name eq '') { + $name=&Apache::lonnet::EXT('resource.title'); + if ($name eq 'con_lost') { $name = ''; } + } + $Apache::lonhomework::name=$name; + my $id = $Apache::inputtags::part; + my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); + $duedate = POSIX::strftime("%c",localtime($duedate)); + my $temp_file; + my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due"; + if (-e $filename) { + $temp_file = Apache::File->new($filename); + } else { + $temp_file = Apache::File->new('>>'.$filename); + } + my @due_file_content = <$temp_file>; + my $due_file_content = $due_file_content[$#due_file_content]; + chomp $due_file_content; + if ($due_file_content ne $duedate) { + $temp_file = Apache::File->new('>'.$filename); + print $temp_file "$duedate\n"; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + if(not $duedate=~m/1969/) { + $result .= '\begin{document} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm'; + } else { + $result .= '\begin{document} \noindent \vskip 1 mm'; + } + } else { + $result .= '\parbox{\minipagewidth}{\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'; + } + } else { + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\begin{document} \noindent \vskip 1 mm'; + } else { + $result .= '\parbox{\minipagewidth}{\vskip 1mm \\\\\\\\'; + } + } } - } - if ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start. - ' - - - -
-
- '; + } elsif ($target eq 'edit') { + $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; - return $result; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - return $result; + } else { + # page_start returned a starting result, delete it if we don't need it + $result = ''; } - return ''; + return $result; } sub end_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; my $status=$Apache::inputtags::status['-1']; - if ($target eq 'grade' || $target eq 'web' ) { - if ( $target eq 'grade' && $Apache::inputtags::part eq '0' && - $status eq 'CAN_ANSWER') { + if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || $target eq 'tex') { + if ( $target eq 'grade' && $Apache::inputtags::part eq '0') { # if part is zero, no s existed, so we need to the grading &Apache::inputtags::grade; - } elsif ($Apache::inputtags::part eq '0') { + } elsif ( ($target eq 'web' || $target eq 'tex') && $Apache::inputtags::part eq '0' && + $status ne 'UNCHECKEDOUT') { # if part is zero, no s existed, so we need show the current # grading status - $result.= &Apache::inputtags::gradestatus($Apache::inputtags::part); + my $gradesatement = &Apache::inputtags::gradestatus($Apache::inputtags::part); + if ($target eq 'tex') { + $gradesatement =~ s///; + $gradesatement =~ s/<\/table>//; + $gradesatement =~ s/]*)>//g; + $gradesatement =~ s/<\/tr>//g; + $gradesatement =~ s/]*)>//g; + $gradesatement =~ s/<\/td>//g; + $gradesatement =~ s//\\textbf{/g; + $gradesatement =~ s/<\/b>/}/g; + $gradesatement =~ s/
/\\vskip 0 mm /g; + $gradesatement =~ s/]*)>//g; + } + $result.= $gradesatement; + if ($target eq 'tex') { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{document} '; + } else { + $result .= '} '; + } + } } - if ($target eq 'web') { + if ( + (($target eq 'web' || $target eq 'tex') && ($ENV{'request.state'} ne 'construct')) || + ($target eq 'answer') + ) { if ($status eq 'CAN_ANSWER') { - $result.="\n"; - } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') { - $result.="\n"; + if ($target ne 'tex') { + $result.="\n"; + } + } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' || + $status eq 'UNCHECKEDOUT' ) { + if ($target ne 'tex') { + $result.="\n"; + } + } + if ($target ne 'tex') { + $result.=&Apache::lonxml::xmlend(); + } else { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{document} '; + } else { + $result .= '} '; + } } - $result.=&Apache::lonxml::xmlend(); } if ($target eq 'grade') { &Apache::lonhomework::showhash(%Apache::lonhomework::results); @@ -252,40 +445,41 @@ sub end_problem { } } elsif ($target eq 'edit') { &Apache::lonxml::debug("in end_problem with $target, edit"); - $result='
'; - } + $result = &problem_edit_footer(); + } return $result; } sub start_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my ($result,$head_tag_start,$body_tag_start)= + my ($result,$head_tag_start,$body_tag_start,$form_tag_start)= &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval); if ($target eq 'edit') { - $result.=$head_tag_start."".$body_tag_start. - '
- - - -
- '; + $result.=$head_tag_start."".$body_tag_start.$form_tag_start. + &problem_edit_header(); my $temp=&Apache::edit::insertlist($target,$token); $result.=$temp; - return $result; - } - if ($target eq 'modified') { + } elsif ($target eq 'modified') { $result=$token->[4]; $result.=&Apache::edit::handle_insert(); - return $result; + } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct" ) { + my $name=&get_resource_name($parstack,$safeeval); + my $rndseed=&setup_rndseed($safeeval); + $result.="$head_tag_start$name + $body_tag_start \n $form_tag_start". + ''; + $result.=&problem_web_to_edit_header($rndseed); } - return ''; + return $result; } sub end_library { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; my $result=''; if ($target eq 'edit') { - $result='
'; + $result=&problem_edit_footer(); + } elsif ($target eq 'web' && $ENV{'request.state'} eq "construct") { + $result.=''.&Apache::lonxml::xmlend(); } return $result; } @@ -293,7 +487,7 @@ sub end_library { sub start_block { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $code = @$parstack[$#$parstack]; $code =~ s/\"//g; $code .=';return $condition;'; @@ -348,58 +542,79 @@ sub end_while { # sub start_randomlist { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); - my $b_parser= HTML::TokeParser->new(\$body); - my $b_tok; - my @randomlist; - my $list_item; - - while($b_tok = $b_parser->get_token() ) { - if($b_tok->[0] eq 'S') { # start tag - # get content of the tag until matching end tag - # get all text upto the matching tag - # and push the content into @randomlist - $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); - $list_item = "$b_tok->[4]"."$list_item"."[1]>"; - push(@randomlist,$list_item); - # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; - } - if($b_tok->[0] eq 'T') { # text - # what to do with text in between tags? - # print "TEXT $b_tok->[1]
"; - } - # if($b_tok->[0] eq 'E') { # end tag, should not happen + my $result; + if ($target eq 'answer' || $target eq 'grade' || $target eq 'web') { + my $body= &Apache::lonxml::get_all_text("/randomlist",$$parser[$#$parser]); + my $b_parser= HTML::TokeParser->new(\$body); + my $b_tok; + my @randomlist; + my $list_item; + while($b_tok = $b_parser->get_token() ) { + if($b_tok->[0] eq 'S') { # start tag + # get content of the tag until matching end tag + # get all text upto the matching tag + # and push the content into @randomlist + $list_item = &Apache::lonxml::get_all_text('/'.$b_tok->[1],$b_parser); + $list_item = "$b_tok->[4]"."$list_item"."[1]>"; + push(@randomlist,$list_item); + # print "
START-TAG $b_tok->[1], $b_tok->[4], $list_item"; + } + if($b_tok->[0] eq 'T') { # text + # what to do with text in between tags? + # print "TEXT $b_tok->[1]
"; + } + # if($b_tok->[0] eq 'E') { # end tag, should not happen # print "END-TAG $b_tok->[1]
"; - # } - } - my @idx_arr = (0 .. $#randomlist); - &Apache::structuretags::shuffle(\@idx_arr); - my $bodytext = ''; - for(0 .. $#randomlist) { - $bodytext .= "$randomlist[ $idx_arr[$_] ]"; + # } + } + my @idx_arr = (0 .. $#randomlist); + &Apache::structuretags::shuffle(\@idx_arr); + my $bodytext = ''; + my $show=$#randomlist; + my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval); + $showarg--; + if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; } + for(0 .. $show) { + $bodytext .= "$randomlist[ $idx_arr[$_] ]"; + } + &Apache::lonxml::newparser($parser,\$bodytext); + } elsif ($target eq 'edit' ) { + $result .= &Apache::edit::tag_start($target,$token); + $result .= &Apache::edit::text_arg('Maximum Tags to Show:','show',$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, + 'show'); + if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } } - - &Apache::lonxml::newparser($parser,\$bodytext); - return ""; + return $result; } sub shuffle { my $a=shift; my $i; - &Apache::response::setrandomnumber(); - for($i=@$a;--$i;) { - my $j=int rand($i+1); - next if $i == $j; - @$a[$i,$j] = @$a[$j,$i]; + if (defined(@$a)) { + &Apache::response::setrandomnumber(); + for($i=@$a;--$i;) { + my $j=int rand($i+1); + next if $i == $j; + @$a[$i,$j] = @$a[$j,$i]; + } } } sub end_randomlist { - return ''; + my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result; + if ($target eq 'edit' ) { + $result=&Apache::edit::tag_end($target,$token,'End Randomly Parsed Block'); + } + return $result; } sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; + my $result=''; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($id eq '') { $id = $Apache::lonxml::curdepth; } $Apache::inputtags::part=$id; @@ -407,7 +622,7 @@ sub start_part { @Apache::inputtags::previous=(); if ($target eq 'meta') { return &Apache::response::mandatory_part_meta; - } elsif ($target eq 'web' || $target eq 'grade') { + } elsif ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') { my ($status,$accessmsg) = &Apache::lonhomework::check_access($id); push (@Apache::inputtags::status,$status); my $expression='$external::datestatus="'.$status.'";'; @@ -416,11 +631,17 @@ sub start_part { if ( $status eq 'CLOSED' ) { my $bodytext=&Apache::lonxml::get_all_text("/part",$$parser[$#$parser]); if ( $target eq "web" ) { - return "
Part is not open to be viewed. It $accessmsg
"; + $result="
Part is not open to be viewed. It $accessmsg
"; + } elsif ( $target eq 'tex' ) { + $result="\\vskip 0 mm Part is not open to be viewed. It $accessmsg \\\\"; + } + } else { + if ($target eq 'tex') { + $result='\vskip 0 mm'; } } } - return ''; + return $result; } sub end_part { @@ -440,7 +661,7 @@ sub end_part { sub start_preduedate { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' && $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER' ) { &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]); @@ -459,6 +680,8 @@ sub start_postanswerdate { if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') { &Apache::lonxml::get_all_text("/postanswerdate",$$parser[$#$parser]); } + } elsif ($target eq 'tex') { + return '\vskip 0 mm \noindent'; } return ''; } @@ -469,7 +692,7 @@ sub end_postanswerdate { sub start_notsolved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; &Apache::lonxml::debug("not solved has :$gradestatus:"); if ($gradestatus =~ /^correct/) { @@ -486,7 +709,7 @@ sub end_notsolved { sub start_solved { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - if ($target eq 'web' || $target eq 'grade') { + if ($target eq 'web' || $target eq 'grade' || $target eq 'answer') { my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"}; if ($gradestatus !~ /^correct/) { &Apache::lonxml::get_all_text("/solved",$$parser[$#$parser]); @@ -511,21 +734,23 @@ sub end_startouttext { my $text=''; if ($target eq 'edit') { - $text=&Apache::lonxml::get_all_text("endouttext",$$parser[$#$parser]); + $text=&Apache::lonxml::get_all_text("endouttext",$$parser[-1]); $result.=&Apache::edit::start_table($token)." + ." -
Text Block Delete:". &Apache::edit::deletelist($target,$token) - ."". &Apache::edit::insertlist($target,$token). - "
\n". - &Apache::edit::editfield($token->[1],$text,"",50,4); + &Apache::edit::end_row().&Apache::edit::start_spanning_row()."\n". + &Apache::edit::editfield($token->[1],$text,"",50,4); } if ($target eq 'modified') { $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); $result=''.&Apache::edit::modifiedfield(); } + if ($target eq 'tex') { + $result .= '\noindent '; + } return $result; } sub start_endouttext { @@ -545,13 +770,13 @@ sub delete_startouttext { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; # my $text=&Apache::lonxml::get_all_text("endouttext",$$parser['-1']); my $text=$$parser['-1']->get_text("/endouttext"); - my $token=$$parser['-1']->get_token(); - &Apache::lonxml::debug("Deleting :$text: and :$token->[0]:$token->[1]:$token->[2]: for startouttext"); - &Apache::lonxml::end_tag($tagstack,$parstack,$token); + my $ntoken=$$parser['-1']->get_token(); + &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext"); + &Apache::lonxml::end_tag($tagstack,$parstack,$ntoken); # Deleting 2 parallel tag pairs, but we need the numbers later to look like # they did the last time round - &Apache::lonxml::increasedepth($token); - &Apache::lonxml::decreasedepth($token); + &Apache::lonxml::increasedepth($ntoken); + &Apache::lonxml::decreasedepth($ntoken); return 1; }