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

Diff for /loncom/homework/inputtags.pm between versions 1.333.2.1 and 1.333.2.2

version 1.333.2.1, 2015/03/19 08:40:38 version 1.333.2.2, 2015/04/21 22:52:44
Line 897  sub valid_award { Line 897  sub valid_award {
   
 {  {
     my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',      my @awards = ('EXTRA_ANSWER', 'MISSING_ANSWER', 'ERROR', 'NO_RESPONSE',
   'WRONG_NUMCHECKEDBOXES','TOO_LONG',    'WRONG_NUMBOXESCHECKED','TOO_LONG',
   'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',    'UNIT_INVALID_INSTRUCTOR', 'UNIT_INVALID_STUDENT',
   'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',    'UNIT_IRRECONCIBLE', 'UNIT_FAIL', 'NO_UNIT',
   'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION',     'UNIT_NOTNEEDED', 'WANTED_NUMERIC', 'BAD_FORMULA',  'NOT_FUNCTION', 
Line 987  sub finalizeawards { Line 987  sub finalizeawards {
  $j++;   $j++;
     }      }
   
       # if at least one response item is set to include lenient grading
       # and that item is partially correct then overall award reflects
       # that, unless an award for one of the other response items does
       # not fall within the basic awards for correct or incorrect.
       if ($Apache::inputtags::leniency) {
           if (($$awardref[$which] eq 'INCORRECT')
               && (grep { $_ eq 'EXACT_ANS' ||
                          $_ eq 'APPROX_ANS' ||
                          $_ eq 'ASSIGNED_SCORE' } (@$awardref))
               && !((grep { $_ ne 'INCORRECT' &&
                            $_ ne 'EXACT_ANS' &&
                            $_ ne 'APPROX_ANS' &&
                            $_ ne 'ASSIGNED_SCORE' } (@$awardref)))) {
               return ('ASSIGNED_SCORE');
           }
       }
   
     if (defined($which)) {      if (defined($which)) {
  if (ref($nameref)) {   if (ref($nameref)) {
     return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);      return ($$awardref[$which],$$msgref[$which],$$nameref[$which]);
Removed from v.1.333.2.1  
changed lines
  Added in v.1.333.2.2

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