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

Diff for /loncom/homework/optionresponse.pm between versions 1.180 and 1.181

version 1.180, 2011/09/30 16:47:08 version 1.181, 2011/10/07 22:39:59
Line 222  sub end_foilgroup { Line 222  sub end_foilgroup {
  push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);   push (@{ $Apache::lonhomework::analyze{"$part_id.options"} },@opt);
     } elsif ( $target eq 'grade') {      } elsif ( $target eq 'grade') {
   
       my $nonlenient=0;  
       my $part=$Apache::inputtags::part;  
       my $lenientparm=&Apache::lonnet::EXT("resource.$part.lenient");  
   
       if ($Apache::lonhomework::scantronmode) {  
          $nonlenient=0;  
 # Grading an exam: we are grading lenient unless told not to  
          if ($lenientparm=~/^0|off|no$/i) {  
             $nonlenient=1;  
          }  
       } else {  
 # Web mode: we are non-lenient unless told to  
          $nonlenient=1;  
          if ($lenientparm=~/^1|on|yes$/i) {  
             $nonlenient=0;  
          }  
       }  
       if ( &Apache::response::submitted()) {        if ( &Apache::response::submitted()) {
   
  my @whichopt = &whichfoils($max,$randomize);   my @whichopt = &whichfoils($max,$randomize);
Line 299  sub end_foilgroup { Line 282  sub end_foilgroup {
   }    }
  }   }
  my $part=$Apache::inputtags::part;   my $part=$Apache::inputtags::part;
           my $nonlenient=&is_nonlenient($part);
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $responsestr=&Apache::lonnet::hash2str(%responsehash);   my $responsestr=&Apache::lonnet::hash2str(%responsehash);
  my $gradestr   =&Apache::lonnet::hash2str(%grade);   my $gradestr   =&Apache::lonnet::hash2str(%grade);
Line 402  sub end_foilgroup { Line 386  sub end_foilgroup {
   return $result;    return $result;
 }  }
   
   sub is_nonlenient {
       my ($part) = @_;
   # Web mode: we are non-lenient unless told otherwise 
       my $defaultparm = 'off';
       my $nonlenient = 0;
   # Grading a bubblesheet exam: we are grading lenient unless told otherwise 
       if ($Apache::lonhomework::scantronmode) {
           $defaultparm = 'on';
           $nonlenient = 1;
       }
       my $lenientparm = 
           &Apache::response::get_response_param($part,'lenient',$defaultparm);  
       if ($lenientparm=~/^0|off|no$/i) {
           $nonlenient = 1;
       } elsif ($lenientparm=~/^1|on|yes$/i) {
           $nonlenient = 0;
       }
       return $nonlenient;
   }
   
 sub getfoilcounts {  sub getfoilcounts {
   my ($max)=@_;    my ($max)=@_;
   # +1 since instructors will count from 1    # +1 since instructors will count from 1
Removed from v.1.180  
changed lines
  Added in v.1.181

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