--- loncom/homework/response.pm	2010/11/24 00:10:06	1.220
+++ loncom/homework/response.pm	2011/12/15 01:21:28	1.230
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # various response type definitons response definition
 #
-# $Id: response.pm,v 1.220 2010/11/24 00:10:06 www Exp $
+# $Id: response.pm,v 1.230 2011/12/15 01:21:28 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -53,6 +53,7 @@ package Apache::response;
 use strict;
 use Apache::lonlocal;
 use Apache::lonnet;
+use Apache::inputtags();
 use Apache::lonmaxima();
 use Apache::lonr();
 
@@ -136,9 +137,10 @@ sub poprandomnumber {
 }
 
 sub setrandomnumber {
-    my ($ignore_id2) = @_;
-    my $rndseed;
-    $rndseed=&Apache::structuretags::setup_rndseed();
+    my ($ignore_id2,$target,$rndseed) = @_;
+    if (!defined($rndseed)) {
+        $rndseed=&Apache::structuretags::setup_rndseed(undef,$target);
+    } 
     if (!defined($rndseed)) { $rndseed=&Apache::lonnet::rndseed(); }
     &Apache::lonxml::debug("randseed $rndseed");
     #  $rndseed=unpack("%32i",$rndseed);
@@ -178,7 +180,7 @@ sub setrandomnumber {
     } else {
 	($rndmod,$rndmod2)=&Apache::lonnet::digest("$id1,$id2");
     }
-
+    $Apache::lonhomework::results{'resource.'.$id1.'.rawrndseed'}=$rndseed;
     if ($rndseed =~/([,:])/) {
 	my $char=$1;
 	use integer;
@@ -195,6 +197,7 @@ sub setrandomnumber {
 	}
     }
     &Apache::lonxml::debug("randseed $rndmod $rndseed");
+    $Apache::lonhomework::results{'resource.'.$id1.'.rndseed'}=$rndseed;
     &Apache::lonnet::setup_random_from_rndseed($rndseed);
     return '';
 }
@@ -283,6 +286,8 @@ sub check_for_previous {
     my ($curresponse,$partid,$id,$last,$type) = @_;
     my %previous;
     $previous{'used'} = 0;
+    my $questiontype = $Apache::lonhomework::type;
+    my $curr_rndseed = $env{'form.'.$partid.'.rndseed'};
     foreach my $key (sort(keys(%Apache::lonhomework::history))) {
 	if ($key =~ /resource\.\Q$partid\E\.\Q$id\E\.submission$/) {
 	    if ( $last && $key =~ /^(\d+):/ ) {
@@ -291,25 +296,34 @@ sub check_for_previous {
 	    &Apache::lonxml::debug("Trying $key");
 	    my $pastresponse=$Apache::lonhomework::history{$key};
 	    if ($pastresponse eq $curresponse) {
-		$previous{'used'} = 1;
 		my $history;
 		if ( $key =~ /^(\d+):/ ) {
-		    $history=$1;
+                    $history=$1;
+                    next if ((($questiontype eq 'randomizetry') ||
+                             ($Apache::lonhomework::history{"$history:resource.$partid.type"} eq 'randomizetry')) &&
+                             ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"}));
 		    $previous{'award'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
 		    $previous{'last'}='0';
 		    push(@{ $previous{'version'} },$history);
 		} else {
+                    next if ((($questiontype eq 'randomizetry') ||
+                             ($Apache::lonhomework::history{"resource.$partid.type"} eq 'randomizetry')) &&
+                             ($curr_rndseed ne $Apache::lonhomework::history{"resource.$partid.rndseed"}));
 		    $previous{'award'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"};
 		    $previous{'last'}='1';
 		}
+                $previous{'used'} = 1;
 		if (! $previous{'award'} ) { $previous{'award'} = 'UNKNOWN';	}
                 if ($previous{'award'} eq 'INTERNAL_ERROR') { $previous{'used'}=0; }
 		&Apache::lonxml::debug("got a match :$previous{'award'}:$previous{'used'}:");
             } elsif ($type eq 'ci') {
                 if (lc($pastresponse) eq lc($curresponse)) {
                     if ($key =~ /^(\d+):/) {
-                        push (@{$previous{'versionci'}},$1);
-                        $previous{'awardci'} = $Apache::lonhomework::history{"resource.$partid.$id.awarddetail"};
+                        my $history = $1;
+                        next if (($questiontype eq 'randomizetry') &&
+                             ($curr_rndseed ne $Apache::lonhomework::history{"$history:resource.$partid.rndseed"}));
+                        push (@{$previous{'versionci'}},$history);
+                        $previous{'awardci'} = $Apache::lonhomework::history{"$history:resource.$partid.$id.awarddetail"};
                         $previous{'usedci'} = 1;
                     }
                 }
@@ -329,7 +343,7 @@ sub handle_previous {
 	} elsif (($Apache::lonhomework::type ne 'survey') &&
                  ($Apache::lonhomework::type ne 'surveycred') &&
                  ($Apache::lonhomework::type ne 'anonsurvey') &&
-                 ($Apache::lonhomework::type ne 'anonsurveycred')) { 
+                 ($Apache::lonhomework::type ne 'anonsurveycred')) {
 	    push(@Apache::inputtags::previous,'PREVIOUSLY_USED');
 	    push(@Apache::inputtags::previous_version,$$previous{'version'});
 	}
@@ -477,12 +491,12 @@ sub end_customresponse {
 	$result .= &Apache::response::answer_footer('customresponse');
     }
     if ($target eq 'web') {
-	&setup_prior_tries_hash(\&format_prior_response_math);
+	&setup_prior_tries_hash(\&format_prior_response_custom);
     }
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
 	$target eq 'tex' || $target eq 'analyze') {
-	&Apache::lonxml::increment_counter(&Apache::response::repetition(),
-					   "$part.$id");
+        my $repetition = &repetition();
+	&Apache::lonxml::increment_counter($repetition,"$part.$id");
 	if ($target eq 'analyze') {
             $Apache::lonhomework::analyze{"$part.$id.type"} = 'customresponse';
 	    &Apache::lonhomework::set_bubble_lines();
@@ -498,6 +512,9 @@ sub end_customresponse {
 
 sub format_prior_response_custom {
     my ($mode,$answer) =@_;
+    if (ref($answer) eq 'ARRAY') {
+        $answer = '('.join(', ', @{ $answer }).')';
+    }
     return '<span class="LC_prior_custom">'.
 	    &HTML::Entities::encode($answer,'"<>&').'</span>';
 }
@@ -990,16 +1007,18 @@ sub getresponse {
 	$Apache::lonhomework::results{"resource.$part.$id.scantron"}.=
 	    $response;
 	if ($resulttype ne 'letter') {
-	    if ($resulttype eq 'A is 1') {
-		$response = $let_to_num{$response}+1;
-	    } else {
-		$response = $let_to_num{$response};
+            $response = $let_to_num{$response};
+            if ($resulttype eq 'A is 1') {
+                if ($response ne "") {
+                    $response = $response+1;
+                }
 	    }
 	    if ($response ne "") {
 		$response += $line * $bubbles_per_line;
 	    }
 	} else {
 	    if ($response ne "") {
+                my $raw = $response;
 		$response = chr(ord($response) + $line * $bubbles_per_line);
 	    }
 	}
@@ -1019,8 +1038,17 @@ sub getresponse {
 
 =item &repetition();
 
-Returns the number of lines that are required to encode the weight.
-(Currently expects that there are 10 bubbles per line)
+In scalar context:
+
+returns: the number of lines that are required to encode the weight.
+(Default is for 10 bubbles per bubblesheet item; other (integer) 
+values can be specified by using a custom Bubblesheet format file 
+with an eighteenth entry (BubblesPerRow) set to the integer 
+appropriate for the bubblesheets which will be used to assign weights.
+
+In array context:
+ 
+returns: number of lines required to encode weight, and bubbles/line.
 
 =cut
 
@@ -1028,9 +1056,25 @@ sub repetition {
     my $id = $Apache::inputtags::part;
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     if (!defined($weight) || ($weight eq '')) { $weight=1; }
-    my $repetition = int($weight/10);
-    if ($weight % 10 != 0) { $repetition++; } 
+    my $bubbles_per_row;
+    if (($env{'form.bubbles_per_row'} =~ /^\d+$/) && 
+        ($env{'form.bubbles_per_row'} > 0)) {
+        $bubbles_per_row = $env{'form.bubbles_per_row'};
+    } else {
+        $bubbles_per_row = 10;
+    }
+    my $denominator = $bubbles_per_row;
+    if (($env{'form.scantron_lastbubblepoints'} == 0) && 
+        ($bubbles_per_row > 1)) {
+        $denominator = $bubbles_per_row - 1;
+    } 
+    my $repetition = int($weight/$denominator);
+    if ($weight % $denominator != 0) { $repetition++; } 
+    if (wantarray) {
+        return ($repetition,$bubbles_per_row);
+    }
     return $repetition;
+
 }
 
 =pod
@@ -1060,11 +1104,24 @@ Arguments
 sub scored_response {
     my ($part,$id)=@_;
     my $repetition=&repetition();
+    my $bubbles_per_row;
+    if (($env{'form.bubbles_per_row'} =~ /^\d+$/) &&
+        ($env{'form.bubbles_per_row'} > 0)) {
+        $bubbles_per_row = $env{'form.bubbles_per_row'};
+    } else {
+        $bubbles_per_row = 10;
+    }
     my $score=0;
     for (my $i=0;$i<$repetition;$i++) {
-	# A is 1, B is 2, etc. (get response return 0-9 and then we add 1)
+	# A is 1, B is 2, etc.
 	my $increase=&Apache::response::getresponse($i+1);
-	if ($increase ne '') { $score+=$increase+1; }
+        unless (($increase == $bubbles_per_row-1) &&
+                ($env{'form.scantron_lastbubblepoints'} == 0)) {
+            # (get response return 0-9 and then we add 1)
+            if ($increase ne '') {
+                $score+=$increase+1;
+            }
+        }
     }
     my $weight = &Apache::lonnet::EXT("resource.$part.weight");
     if (!defined($weight) || $weight eq '' || $weight eq 0) { $weight = 1; }
@@ -1076,7 +1133,7 @@ sub scored_response {
 }
 
 sub whichorder {
-    my ($max,$randomize,$showall,$hash)=@_;
+    my ($max,$randomize,$showall,$hash,$rndseed)=@_;
     #&Apache::lonxml::debug("man $max randomize $randomize");
     if (!defined(@{ $$hash{'names'} })) { return; }
     my @names = @{ $$hash{'names'} };
@@ -1130,9 +1187,15 @@ sub show_answer {
     my $part   = $Apache::inputtags::part;
     my $award  = $Apache::lonhomework::history{"resource.$part.solved"};
     my $status = $Apache::inputtags::status[-1];
-    return  ( ($award =~ /^correct/
-	       && &Apache::lonhomework::show_problem_status())
-	      || $status eq "SHOW_ANSWER");
+    my $canshow = 0;
+    if ($award =~ /^correct/) {
+        if (($Apache::lonhomework::history{"resource.$part.awarded"} >= 1) ||
+            (&Apache::lonnet::EXT("resource.$part.retrypartial") !~/^1|on|yes$/)) {
+            $canshow = 1;
+        }   
+    }
+    return  (($canshow && &Apache::lonhomework::show_problem_status()) 
+	     || $status eq "SHOW_ANSWER");
 }
 
 sub analyze_store_foilgroup {
@@ -1316,25 +1379,40 @@ sub check_status {
     - scalars that are other elements of the history hash to pass to $func
     - ref to data to be passed untouched to $func
 
+  $questiontype is the questiontype (currently only passed in if
+      randomizebytry.
+
 =cut
 
 sub setup_prior_tries_hash {
-    my ($func,$data) = @_;
+    my ($func,$data,$questiontype) = @_;
     my $part = $Apache::inputtags::part;
-    my $id   = $Apache::inputtags::response[-1];	
+    my $id   = $Apache::inputtags::response[-1];
     foreach my $i (1..$Apache::lonhomework::history{'version'}) {
-	my $sub_key   = "$i:resource.$part.$id.submission";
+        my $partprefix = "$i:resource.$part";
+	my $sub_key   = "$partprefix.$id.submission";
 	next if (!exists($Apache::lonhomework::history{$sub_key}));
+        my $type_key = "$partprefix.type";
+        my $type = $Apache::lonhomework::history{$type_key};
 	my @other_data;
-	foreach my $datum (@{ $data }) {
-	    if (ref($datum)) {
-		push(@other_data,$datum);
-	    } else {
-		my $info_key = "$i:resource.$part.$id.$datum";
-		push(@other_data,$Apache::lonhomework::history{$info_key});
+        if (ref($data) eq 'ARRAY') {
+	    foreach my $datum (@{ $data }) {
+	        if (ref($datum)) {
+		    push(@other_data,$datum);
+	        } else {
+		    my $info_key = "$i:resource.$part.$id.$datum";
+		    push(@other_data,$Apache::lonhomework::history{$info_key});
+	        }
 	    }
-	}
-
+        }
+        if ($questiontype eq 'randomizetry') { 
+            my $order_key = "$partprefix.$id.foilorder";
+            my @whichopts = &Apache::lonnet::str2array($Apache::lonhomework::history{$order_key});
+            if (@whichopts > 0) {
+                shift(@other_data);
+                unshift(@other_data,\@whichopts);
+            }
+        }
 	my $output =
 	    &$func('grade',
 		   $Apache::lonhomework::history{$sub_key},