--- loncom/homework/structuretags.pm 2005/11/03 12:20:54 1.311 +++ loncom/homework/structuretags.pm 2005/11/03 17:55:12 1.312 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # definition of tags that give a structure to a document # -# $Id: structuretags.pm,v 1.311 2005/11/03 12:20:54 foxr Exp $ +# $Id: structuretags.pm,v 1.312 2005/11/03 17:55:12 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -422,10 +422,6 @@ sub firstaccess_msg { ENDCHECKOUT } -# initializes the problem globals across the inputtags, lonhomework, and -# structuretags modules. -# -# sub init_problem_globals { my ($type)=@_; #initialize globals @@ -500,8 +496,7 @@ sub start_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; # We'll use the redirection to fix up printing of duedates. - - &Apache::lonxml::startredirection; + &Apache::lonxml::startredirection(); # Problems don't nest and we don't allow more than one in # a .problem file. @@ -674,18 +669,17 @@ sub start_problem { my $toc_line='\vskip 1 mm\noindent '.$startminipage. '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}'; - # Figure out what the due date is and if we need to print it in the problem header. - # We have been logging the last due date written to file. - # - + # Figure out what the due date is and if we need to print + # it in the problem header. We have been logging the + # last due date written to file. my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); my $duedate = POSIX::strftime("%c",localtime($duetime)); my $temp_file; my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due"; - # Figure out what the last printed due date is or set it to the epoch if no duedates - # have been printed. + # Figure out what the last printed due date is or set it + # to the epoch if no duedates have been printed. my $due_file_content = 0; # If the file does not yet exist, time is the epoch. if (-e $filename) { @@ -694,9 +688,8 @@ sub start_problem { $due_file_content = $due_file[$#due_file]; chomp $due_file_content; } - # The big change; Due do the comparison on - # the absolute time rather than textual time since that is format independent. - # + + # comparisons of the absolute times if ($due_file_content != $duetime) { $temp_file = Apache::File->new('>'.$filename); print $temp_file "$duetime\n"; @@ -739,7 +732,7 @@ sub start_problem { sub end_problem { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - my $result= &Apache::lonxml::endredirection; # This captures the entire .... body. + my $result= &Apache::lonxml::endredirection(); # started in &start_problem my $status=$Apache::inputtags::status['-1']; if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || @@ -1180,7 +1173,8 @@ sub ordered_show_check { sub start_part { my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_; - &Apache::lonxml::startredirection; # we'll use redirection to fix up duedates. + &Apache::lonxml::startredirection(); # we'll use redirection to fix up + # duedates. my $result=''; my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval); if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; } @@ -1289,10 +1283,8 @@ sub end_part { my $status=$Apache::inputtags::status['-1']; my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part); my $in_order_show=&ordered_show_check(); - my $result= &Apache::lonxml::endredirection; # $resutl has entire body. - if ( $target eq 'meta' ) { - $result.=''; - } elsif ($target eq 'grade') { + my $result= &Apache::lonxml::endredirection(); # started in &start_part + if ($target eq 'grade') { if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) && !$hidden && $in_order_show) { $result.=&Apache::inputtags::grade;