Diff for /loncom/homework/structuretags.pm between versions 1.27 and 1.28

version 1.27, 2001/01/05 20:05:26 version 1.28, 2001/01/06 16:35:36
Line 65  sub start_problem { Line 65  sub start_problem {
     if ($status eq 'CAN_ANSWER') {      if ($status eq 'CAN_ANSWER') {
       # create a page header and exit        # create a page header and exit
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";        return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n<form name=\"lonhomework\" method=\"POST\" action=\"".$ENV{'request.uri'}."\">";
     } elsif ($status eq 'SHOW_ANSWER') {      } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER' ) {
       return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n";        return "<title>$name</title>\n<body bgcolor=#FFFFFF>\n";
     }      }
   }    }
Line 77  sub end_problem { Line 77  sub end_problem {
   my $result='';    my $result='';
   my $status=$Apache::inputtags::status['-1'];    my $status=$Apache::inputtags::status['-1'];
   unless ($target eq 'meta') {    unless ($target eq 'meta') {
     if ( $target eq 'grade' && $Apache::inputtags::part eq '0') {      if ( $target eq 'grade' && $Apache::inputtags::part eq '0' &&
          $status eq 'CAN_ANSWER') {
       # if part is zero, no <part>s existed, so we need to the grading        # if part is zero, no <part>s existed, so we need to the grading
       &Apache::inputtags::grade;        &Apache::inputtags::grade;
     } elsif ($Apache::inputtags::part eq '0') {      } elsif ($Apache::inputtags::part eq '0') {
Line 88  sub end_problem { Line 89  sub end_problem {
     if ($target eq 'web') {       if ($target eq 'web') { 
       if ($status eq 'CAN_ANSWER') {        if ($status eq 'CAN_ANSWER') {
  $result.="</form></body>\n";    $result.="</form></body>\n"; 
       } elsif ($status eq 'SHOW_ANSWER') {        } elsif ($status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
  $result.="</body>\n";    $result.="</body>\n"; 
       }         } 
     }      }
Line 231  sub start_part { Line 232  sub start_part {
 sub end_part {  sub end_part {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   &Apache::lonxml::debug("in end_part $target ");    &Apache::lonxml::debug("in end_part $target ");
     my $status=$Apache::inputtags::status['-1'];
   pop @Apache::inputtags::status;    pop @Apache::inputtags::status;
   if ( $target eq 'meta' ) { return ''; }    if ( $target eq 'meta' ) { return ''; }
   if ( $target eq 'grade' ) { return &Apache::inputtags::grade; }    if ( $target eq 'grade' && $status eq 'CAN_ANSWER') { 
       return &Apache::inputtags::grade; 
     }
   return &Apache::inputtags::gradestatus($Apache::inputtags::part);    return &Apache::inputtags::gradestatus($Apache::inputtags::part);
 }  }
   
 sub start_preduedate {  sub start_preduedate {
   my ($target,$token,$parstack,$parser,$safeeval)=@_;    my ($target,$token,$parstack,$parser,$safeeval)=@_;
   if ($target ne 'meta') {    if ($target ne 'meta') {
     if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER') {      if ($Apache::inputtags::status['-1'] eq 'CAN_ANSWER' ||
    $Apache::inputtags::status['-1'] eq 'CANNOT_ANSWER' ) {
       &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);        &Apache::lonxml::get_all_text("/preduedate",$$parser[$#$parser]);
     }      }
   }    }

Removed from v.1.27  
changed lines
  Added in v.1.28


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