[LON-CAPA-cvs] cvs: loncom /homework grades.pm

[raeburn]

raeburn		Fri Jun 28 22:40:05 2013 EDT

  Modified files:              
    /loncom/homework	grades.pm 
  Log:
  - Eliminate duplicate definition.
  - Empty line before =cut in POD.
  - scantron_find_student() subroutine is within this package.
  
  
Index: loncom/homework/grades.pm
diff -u loncom/homework/grades.pm:1.692 loncom/homework/grades.pm:1.693
--- loncom/homework/grades.pm:1.692	Wed Jun 26 21:22:48 2013
+++ loncom/homework/grades.pm	Fri Jun 28 22:40:04 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.692 2013/06/26 21:22:48 raeburn Exp $
+# $Id: grades.pm,v 1.693 2013/06/28 22:40:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -7431,6 +7431,7 @@
      startline    - Reference to hash where key is question number (0 is first)
                     and key is number of first bubble line for current student
                     or code-based randompick and/or randomorder.
+
 =cut
 
 
@@ -8065,7 +8066,7 @@
     my $max_bubble=&scantron_get_maxbubble(\$nav_error,\%scantron_config);
     if ($nav_error) {
         $r->print(&navmap_errormsg());
-        return '';
+        return(1,$currentphase);
     }
 
     if (!$max_bubble) { $max_bubble=2**31; }
@@ -8188,7 +8189,7 @@
     }
     my $map=$navmap->getResourceByUrl($sequence);
     my ($randomorder,$randompick, at master_seq,%symb_to_resource,%grader_partids_by_symb,
-        %grader_randomlists_by_symb,%orderedforcode);
+        %grader_randomlists_by_symb);
     if (ref($map)) {
         $randomorder = $map->randomorder();
         $randompick = $map->randompick();
@@ -8878,8 +8879,8 @@
         my $scan_record=
             &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config,
                                                      $scan_data);
-        unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data,
-                                                              \%idmap,$i)) {
+        unless ($uname=&scantron_find_student($scan_record,$scan_data,
+                                              \%idmap,$i)) {
             &Apache::grades::scantron_add_delay(\@delayqueue,$line,
                                 'Unable to find a student that matches',1);
             next;