Diff for /loncom/homework/inputtags.pm between versions 1.205 and 1.206

version 1.205, 2006/09/21 21:23:19 version 1.206, 2006/09/29 20:55:33
Line 485  sub show_past_portfile_submission { Line 485  sub show_past_portfile_submission {
 }  }
   
 sub checkstatus {  sub checkstatus {
     my ($value,$awardref,$msgref)=@_;      my ($value,$awardref,$msgref,$nameref)=@_;
     for (my $i=0;$i<=$#$awardref;$i++) {      for (my $i=0;$i<=$#$awardref;$i++) {
  if ($$awardref[$i] eq $value) {   if ($$awardref[$i] eq $value) {
     return ($$awardref[$i],$$msgref[$i]);      if (ref($nameref)) {
    return ($$awardref[$i],$$msgref[$i],$$nameref[$i]);
       } else {
    return ($$awardref[$i],$$msgref[$i]);
       }
  }   }
     }      }
     return(undef,undef);      return(undef,undef);
Line 513  sub valid_award { Line 517  sub valid_award {
   
 sub finalizeawards {  sub finalizeawards {
     my ($awardref,$msgref,$nameref,$reverse)=@_;      my ($awardref,$msgref,$nameref,$reverse)=@_;
     my $result=undef;      my ($result,$award,$msg,$name);
     my $award;  
     my $msg;  
     if ($#$awardref == -1) { $result = "NO_RESPONSE"; }      if ($#$awardref == -1) { $result = "NO_RESPONSE"; }
     if ($result eq '' ) {      if ($result eq '' ) {
  my $blankcount;   my $blankcount;
Line 541  sub finalizeawards { Line 543  sub finalizeawards {
   'APPROX_ANS', 'EXACT_ANS');    'APPROX_ANS', 'EXACT_ANS');
     if ($reverse) { @awards=reverse(@awards); }      if ($reverse) { @awards=reverse(@awards); }
     foreach my $possibleaward (@awards) {      foreach my $possibleaward (@awards) {
  ($result,$msg)=&checkstatus($possibleaward,$awardref,$msgref);   ($result,$msg,$name)=&checkstatus($possibleaward,$awardref,$msgref,
  if (defined($result)) { return ($result,$msg); }    $nameref);
    if (defined($result)) { return ($result,$msg,$name); }
     }      }
     return ('ERROR',undef);      return ('ERROR',undef);
 }  }

Removed from v.1.205  
changed lines
  Added in v.1.206


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