--- loncom/homework/optionresponse.pm 2011/11/08 05:19:14 1.182 +++ loncom/homework/optionresponse.pm 2011/11/29 13:24:38 1.183 @@ -1,7 +1,7 @@ # LearningOnline Network with CAPA # option list style responses # -# $Id: optionresponse.pm,v 1.182 2011/11/08 05:19:14 raeburn Exp $ +# $Id: optionresponse.pm,v 1.183 2011/11/29 13:24:38 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -32,6 +32,7 @@ package Apache::optionresponse; use strict; +use Apache::inputtags(); use Apache::response(); use Apache::lonlocal; use Apache::lonnet; @@ -282,7 +283,7 @@ sub end_foilgroup { } } my $part=$Apache::inputtags::part; - my $nonlenient=&is_nonlenient($part); + my $nonlenient=&Apache::inputtags::grading_is_nonlenient($part); my $id = $Apache::inputtags::response['-1']; my $responsestr=&Apache::lonnet::hash2str(%responsehash); my $gradestr =&Apache::lonnet::hash2str(%grade); @@ -386,26 +387,6 @@ sub end_foilgroup { 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 { my ($max)=@_; # +1 since instructors will count from 1