--- loncom/homework/structuretags.pm 2003/06/04 14:49:20 1.179 +++ loncom/homework/structuretags.pm 2003/06/13 14:01:26 1.183 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.179 2003/06/04 14:49:20 albertel Exp $ +# $Id: structuretags.pm,v 1.183 2003/06/13 14:01:26 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -43,9 +43,9 @@ BEGIN { sub start_web { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); - if ($target eq 'web') { - return $bodytext; + if (!($target eq 'web' || $target eq 'edit' || $target eq 'modified' || + $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { + my $bodytext=&Apache::lonxml::get_all_text("/web",$parser); } return ''; } @@ -56,9 +56,10 @@ sub end_web { sub start_tex { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); - if ($target eq 'tex') { - return $bodytext.' '; + if (!($target eq 'tex' || $target eq 'edit' || $target eq 'modified' || + $target eq 'answer' || $target eq 'grade' || $target eq 'meta' )) { + &Apache::lonxml::debug("tex 1"); + my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser); } return ''; } @@ -154,6 +155,8 @@ sub setup_rndseed { $rndseed=int(rand(1000000000)); } $ENV{'form.rndseed'}=$rndseed; + delete($ENV{'form.resetdata'}); + delete($ENV{'form.newrandomization'}); } &Apache::lonxml::debug("Setting rndseed to $rndseed"); &Apache::run::run('$external::randomseed='.$rndseed.';',$safeeval); @@ -264,10 +267,7 @@ sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; $Apache::lonhomework::parsing_a_problem=1; - # 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' ) { + if ( $Apache::inputtags::part ne '' ) { &Apache::lonxml::error('Only one problem allowed in a .problem file'); my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser); return ''; @@ -934,6 +934,8 @@ sub end_part { $target); if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} $result=$gradestatus; + } elsif ($target eq 'edit') { + $result=&Apache::edit::end_table(); } pop @Apache::inputtags::status; $Apache::inputtags::part='';