--- loncom/homework/structuretags.pm 2002/11/22 19:46:36 1.138 +++ loncom/homework/structuretags.pm 2002/12/05 14:37:17 1.141 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.138 2002/11/22 19:46:36 albertel Exp $ +# $Id: structuretags.pm,v 1.141 2002/12/05 14:37:17 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -118,7 +118,7 @@ sub page_start { return ($result,$head_tag_start,$body_tag_start,$form_tag_start); } -use Time::HiRes(); +#use Time::HiRes(); sub get_resource_name { my ($parstack,$safeeval)=@_; my $name=&Apache::lonnet::gettitle(); @@ -426,15 +426,15 @@ sub end_problem { $result.="\n"; } } - if ($target ne 'tex') { + if ($target eq 'web') { $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{minipage}\end{document} '; - } else { - $result .= ''; - } + } elsif ($target eq 'tex') { + $result .= '\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}'; + if (not $ENV{'request.symb'} =~ m/\.page_/) { + $result .= '\end{minipage}\end{document} '; + } else { + $result .= ''; + } } } if ($target eq 'grade') { @@ -695,17 +695,19 @@ sub end_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; &Apache::lonxml::debug("in end_part $target "); my $status=$Apache::inputtags::status['-1']; - pop @Apache::inputtags::status; - if ( $target eq 'meta' ) { return ''; } - if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { - return &Apache::inputtags::grade; - } - if ($target eq 'web' || $target eq 'tex' ) { - my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part,$target); + my $result=''; + if ( $target eq 'meta' ) { + $result=''; + } elsif ( $target eq 'grade' && $status eq 'CAN_ANSWER') { + $result=&Apache::inputtags::grade; + } elsif ($target eq 'web' || $target eq 'tex' ) { + my $gradestatus=&Apache::inputtags::gradestatus($Apache::inputtags::part, + $target); if ($Apache::lonhomework::type eq 'exam') {$gradestatus='';} - return $gradestatus; + $result=$gradestatus; } - return ''; + pop @Apache::inputtags::status; + return $result; } sub start_preduedate {