[LON-CAPA-cvs] cvs: loncom /homework radiobuttonresponse.pm response.pm
foxr
lon-capa-cvs-allow@mail.lon-capa.org
Wed, 20 Jun 2007 22:36:53 -0000
foxr Wed Jun 20 18:36:53 2007 EDT
Modified files:
/loncom/homework radiobuttonresponse.pm response.pm
Log:
Factor the multi-line bubble stuff out of radiobuttonresponse.pm and put
it into response.pm
Index: loncom/homework/radiobuttonresponse.pm
diff -u loncom/homework/radiobuttonresponse.pm:1.117 loncom/homework/radiobuttonresponse.pm:1.118
--- loncom/homework/radiobuttonresponse.pm:1.117 Wed Jun 20 17:43:59 2007
+++ loncom/homework/radiobuttonresponse.pm Wed Jun 20 18:36:52 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# mutliple choice style responses
#
-# $Id: radiobuttonresponse.pm,v 1.117 2007/06/20 21:43:59 foxr Exp $
+# $Id: radiobuttonresponse.pm,v 1.118 2007/06/20 22:36:52 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -146,48 +146,26 @@
my ($answer,@whichfoils)=&whichfoils($max,$randomize);
if ( !&Apache::response::submitted() ) { return; }
my $response;
+
+ # Need to know how many foils we have so that I know how many
+ # bubble lines to consume:
+
+ my $numfoils = scalar @whichfoils;
+ my $bubble_lines = int($numfoils / $bubbles_per_line);
+ if (($numfoils % $bubbles_per_line) != 0) {
+ $bubble_lines++; # Partial line of bubbles too.
+ }
+
+
if ($env{'form.submitted'} eq 'scantron') {
- # Need to know how many foils we have so that I know how many
- # bubble lines to consume:
-
- my $numfoils = scalar @whichfoils;
- my $bubble_lines = int($numfoils / $bubbles_per_line);
- if (($numfoils % $bubbles_per_line) != 0) {
- $bubble_lines++; # Partial line of bubbles too.
- }
- # Get an array of the lines... note offsets seem to go from 1??...
-
- my @responses;
- for (my $i = 1; $i <= $bubble_lines; $i++) {
- my $this_line = &Apache::response::getresponse($i);
- push(@responses, $this_line);
-
- }
- # Update the lonxml::counter so that the next problem
- # Gets the right set of answers:
-
- &Apache::lonxml::increment_counter($bubble_lines-1);
-
- # This code assumes that unbubbled lines will be
- # give empties. while bubbled lines nonblank.
-
- my $answer_line;
- my $answer_value = ''; # By default no answer given...
- my $num_bubbled_lines=0;
- for (my $line_number = 0; $line_number < $bubble_lines; $line_number++) {
- if ($responses[$line_number] ne "") {
- $answer_line = $line_number;
- $answer_value = $responses[$line_number];
- last;
- }
- }
-
- $response = $answer_line * $bubbles_per_line + $answer_value;
-
+ $response = &Apache::response::getresponse(1,undef,$bubble_lines,
+ $bubbles_per_line);
} else {
$response = $env{'form.HWVAL_'.$Apache::inputtags::response['-1']};
}
+ &Apache::lonxml::increment_counter($bubble_lines-1);
+
if ( $response !~ /[0-9]+/) { return; }
my $part=$Apache::inputtags::part;
my $id = $Apache::inputtags::response['-1'];
Index: loncom/homework/response.pm
diff -u loncom/homework/response.pm:1.171 loncom/homework/response.pm:1.172
--- loncom/homework/response.pm:1.171 Tue Jun 19 15:34:18 2007
+++ loncom/homework/response.pm Wed Jun 20 18:36:52 2007
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# various response type definitons response definition
#
-# $Id: response.pm,v 1.171 2007/06/19 19:34:18 albertel Exp $
+# $Id: response.pm,v 1.172 2007/06/20 22:36:52 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -860,11 +860,15 @@
$resulttype - undef -> a number between 0 and 25
'A is 1' -> a number between 1 and 26
'letter' -> a letter between 'A' and 'Z'
-
+ $lines - undef problem only needs a single line of bubbles.
+ nonzero Problem wants the first nonempty response in
+ $lines lines of bubbles.
+ $bubbles_per_line - Must be provided if lines is defined.. number of
+ bubbles on a line.
=cut
sub getresponse {
- my ($offset,$resulttype)=@_;
+ my ($offset,$resulttype, $lines, $bubbles_per_line)=@_;
my $formparm='form.HWVAL_'.$Apache::inputtags::response['-1'];
my $response;
if (!defined($offset)) {
@@ -872,6 +876,10 @@
} else {
$formparm.=":$offset";
}
+ if (!defined($lines)) {
+ $lines = 1;
+ }
+
my %let_to_num=('A'=>0,'B'=>1,'C'=>2,'D'=>3,'E'=>4,'F'=>5,'G'=>6,'H'=>7,
'I'=>8,'J'=>9,'K'=>10,'L'=>11,'M'=>12,'N'=>13,'O'=>14,
'P'=>15,'Q'=>16,'R'=>17,'S'=>18,'T'=>19,'U'=>20,'V'=>21,
@@ -879,21 +887,43 @@
if ($env{'form.submitted'} eq 'scantron') {
my $part = $Apache::inputtags::part;
my $id = $Apache::inputtags::response[-1];
- $response = $env{'scantron.'.($Apache::lonxml::counter+$offset-1).
- '.answer'};
- # save bubbled letter for later
- $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
- $response;
+
+ my $line;
+ for ($line = 0; $line < $lines; $line++) {
+ $response = $env{'scantron.'.
+ ($Apache::lonxml::counter+$offset-1+$line).
+ '.answer'};
+ if ($response ne "") {
+ last;
+ }
+
+ }
if ($resulttype ne 'letter') {
if ($resulttype eq 'A is 1') {
$response = $let_to_num{$response}+1;
} else {
$response = $let_to_num{$response};
}
+ if ($response ne "") {
+ $response += $line * $bubbles_per_line;
+ }
+ } else {
+ if ($response ne "") {
+ $response = chr(ord($response) + $line * $bubbles_per_line);
+ }
}
+ # save submitted response for later
+ $Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
+ $response;
+
} else {
$response = $env{$formparm};
}
+ #
+ # If we have a nonempty answer, correct the numeric value
+ # of the answer for the line on which it was found.
+ #
+
return $response;
}