[BACK]Return to structuretags.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/structuretags.pm between versions 1.320 and 1.321

version 1.320, 2005/11/10 22:01:30 version 1.321, 2005/11/15 21:13:42
Line 513  sub start_problem { Line 513  sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
   
     # We'll use the redirection to fix up printing of duedates.      # We'll use the redirection to fix up printing of duedates.
     &Apache::lonxml::startredirection();      if (!$Apache::lonxml::metamode) {
    &Apache::lonxml::startredirection();
       }
   
     # Problems don't nest and we don't allow more than one <problem> in      # Problems don't nest and we don't allow more than one <problem> in
     # a .problem file.      # a .problem file.
Line 683  sub start_problem { Line 685  sub start_problem {
   
 sub end_problem {  sub end_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result= &Apache::lonxml::endredirection(); # started in &start_problem      my $result;
   
     # Figure out the front matter which was too deeply coupled for me to easily      if (!$Apache::lonxml::metamode) {
     # unravel and replace the INSERTTEXFRONTMATTERHERE in result with it.   $result = &Apache::lonxml::endredirection(); #started in &start_problem
     # note that we do this in end_problem because whether or not we display      }
     # due dates depends on whether due dates have already been displayed in the problem parts.  
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
   
    # Figure out the front matter and replace the
    # INSERTTEXFRONTMATTERHERE in result with it.  note that we do
    # this in end_problem because whether or not we display due
    # dates depends on whether due dates have already been
    # displayed in the problem parts.
   
  my $frontmatter   = '';   my $frontmatter   = '';
  my $startminipage = '';   my $startminipage = '';
  if (not $env{'form.problem_split'}=~/yes/) {   if (not $env{'form.problem_split'}=~/yes/) {
Line 1215  sub ordered_show_check { Line 1223  sub ordered_show_check {
   
 sub start_part {  sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     &Apache::lonxml::startredirection(); # we'll use redirection to fix up       if (!$Apache::lonxml::metamode) {
                                          # duedates.   &Apache::lonxml::startredirection(); # we'll use redirection to fix up 
                                        # duedates.
       }
     my $result='';      my $result='';
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }      if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
Line 1325  sub end_part { Line 1335  sub end_part {
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $in_order_show=&ordered_show_check();      my $in_order_show=&ordered_show_check();
     my $result= &Apache::lonxml::endredirection(); # started in &start_part      my $result;
       if (!$Apache::lonxml::metamode) {
    $result = &Apache::lonxml::endredirection(); # started in &start_part
       }
     if ($target eq 'grade') {      if ($target eq 'grade') {
  if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&   if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
     !$hidden && $in_order_show) {      !$hidden && $in_order_show) {
Removed from v.1.320  
changed lines
  Added in v.1.321

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>