--- loncom/homework/grades.pm	2013/05/30 05:04:31	1.688
+++ loncom/homework/grades.pm	2013/06/16 16:46:48	1.690
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.688 2013/05/30 05:04:31 raeburn Exp $
+# $Id: grades.pm,v 1.690 2013/06/16 16:46:48 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5174,24 +5174,6 @@ sub restore_bubble_lines {
     }
 }
 
-#  Given the parsed scanline, get the response for 
-#  'answer' number n:
-
-sub get_response_bubbles {
-    my ($parsed_line, $response)  = @_;
-
-    my $bubble_line = $first_bubble_line{$response-1} +1;
-    my $bubble_lines= $bubble_lines_per_response{$response-1};
-    
-    my $selected = "";
-
-    for (my $bline = 0; $bline < $bubble_lines; $bline++) {
-	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
-	$bubble_line++;
-    }
-    return $selected;
-}
-
 =pod 
 
 =item scantron_filenames
@@ -7923,9 +7905,10 @@ sub scantron_process_students {
         return '';
     }  
     my $map=$navmap->getResourceByUrl($sequence);
-    my $randomorder;
+    my ($randomorder,$randompick);
     if (ref($map)) {
         $randomorder = $map->randomorder();
+        $randompick = $map->randompick();
     }
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     my (%grader_partids_by_symb,%grader_randomlists_by_symb,%ordered);
@@ -8034,7 +8017,7 @@ SCANTRONFORM
         }
 
         my @mapresources = @resources;
-        if ($randomorder) {
+        if ($randomorder || $randompick) {
             @mapresources = 
                 &users_order($user,$scancode,$sequence,\@master_seq,\%ordered,
                              \%symb_to_resource);
@@ -8539,9 +8522,10 @@ sub checkscantron_results {
         return '';
     }
     my $map=$navmap->getResourceByUrl($sequence);
-    my ($randomorder,@master_seq,%symb_to_resource);
+    my ($randomorder,$randompick,@master_seq,%symb_to_resource);
     if (ref($map)) { 
         $randomorder=$map->randomorder();
+        $randompick=$map->randompick();
     }
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
     foreach my $resource (@resources) {
@@ -8619,7 +8603,7 @@ sub checkscantron_results {
         }
 
         my @mapresources = @resources;
-        if ($randomorder) {
+        if ($randomorder || $randompick) {
             @mapresources =
                 &users_order($user,$scancode,$sequence,\@master_seq,\%ordered,
                              \%symb_to_resource);