--- loncom/homework/grades.pm	2010/01/27 05:12:15	1.574.2.7
+++ loncom/homework/grades.pm	2010/05/22 01:01:03	1.574.2.12
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.574.2.7 2010/01/27 05:12:15 raeburn Exp $
+# $Id: grades.pm,v 1.574.2.12 2010/05/22 01:01:03 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -771,7 +771,7 @@ sub verifyreceipt {
 
     my $title.=
 	'<h3><span class="LC_info">'.
-	&mt('Verifying  Receipt No. [_1]',$receipt).
+	&mt('Verifying Receipt No. [_1]',$receipt).
 	'</span></h3>'."\n".
 	'<h4>'.&mt('<b>Resource: </b>[_1]',$env{'form.probTitle'}).
 	'</h4>'."\n";
@@ -831,11 +831,11 @@ sub verifyreceipt {
 	}
     }
     if ($matches == 0) {
-	$string = $title.&mt('No match found for the above receipt.');
+	$string = $title.&mt('No match found for the above receipt number.');
     } else {
 	$string = &jscriptNform($symb).$title.
 	    '<p>'.
-	    &mt('The above receipt matches the following [numerate,_1,student].',$matches).
+	    &mt('The above receipt number matches the following [numerate,_1,student].',$matches).
 	    '</p>'.
 	    $header.
 	    $contents.
@@ -1754,8 +1754,6 @@ sub gradeBox {
     }
     $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
 
-
-	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
     $result .= 
 	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>';
     $result.='</tr></table>'."\n";
@@ -3853,7 +3851,6 @@ ENDPICK
 }
 
 sub csvupload_fields {
-    my ($symb) = @_;
     my ($symb,$errorref) = @_;
     my (@parts) = &getpartlist($symb,$errorref);
     if (ref($errorref)) {
@@ -7416,6 +7413,7 @@ sub scantron_get_maxbubble {
         if (ref($nav_error)) {
             $$nav_error = 1;
         }
+        return;
     }
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
@@ -7579,8 +7577,15 @@ sub scantron_process_students {
     my (%grader_partids_by_symb,%grader_randomlists_by_symb);
     &graders_resources_pass(\@resources,\%grader_partids_by_symb,
                             \%grader_randomlists_by_symb);
+    my $resource_error;
     foreach my $resource (@resources) {
-        my $ressymb = $resource->symb();
+        my $ressymb;
+        if (ref($resource)) {
+            $ressymb = $resource->symb();
+        } else {
+            $resource_error = 1;
+            last;
+        }
         my ($analysis,$parts) =
             &scantron_partids_tograde($resource,$env{'request.course.id'},
                                       $env{'user.name'},$env{'user.domain'},1);
@@ -7592,6 +7597,10 @@ sub scantron_process_students {
             }
         }
     }
+    if ($resource_error) {
+        $r->print(&navmap_errormsg());
+        return '';
+    }
 
     my ($uname,$udom);
     my $result= <<SCANTRONFORM;
@@ -7662,9 +7671,15 @@ SCANTRONFORM
  	}
   	($uname,$udom)=split(/:/,$uname);
 
-        my %partids_by_symb;
+        my (%partids_by_symb,$res_error);
         foreach my $resource (@resources) {
-            my $ressymb = $resource->symb();
+            my $ressymb;
+            if (ref($resource)) {
+                $ressymb = $resource->symb();
+            } else {
+                $res_error = 1;
+                last;
+            }
             if ((exists($grader_randomlists_by_symb{$ressymb})) ||
                 (ref($grader_partids_by_symb{$ressymb}) ne 'ARRAY')) {
                 my ($analysis,$parts) =
@@ -7675,6 +7690,12 @@ SCANTRONFORM
             }
         }
 
+        if ($res_error) {
+            &scantron_add_delay(\@delayqueue,$line,
+                                'An error occurred while grading student '.$uname,2);
+            next;
+        }
+
 	&Apache::lonxml::clear_problem_counter();
   	&Apache::lonnet::appenv($scan_record);
 
@@ -8448,11 +8469,11 @@ sub grading_menu {
     push(@menu, { url => $url,
                    name => &mt('Grade/Manage/Review Bubblesheets'),
                    short_description =>
-            &mt('Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.')});
+            &mt('Grade bubblesheet exams, upload/download bubblesheet data files, and review previously graded bubblesheet exams.')});
     $fields{'command'} = 'verify';
     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
     push(@menu, { url => "",
-                   name => &mt('Verify Receipt'),
+                   name => &mt('Verify Receipt No.'),
                    short_description =>
             &mt('')});
     # Create the menu
@@ -8467,14 +8488,14 @@ sub grading_menu {
 	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
 	'<input type="hidden" name="showgrading" value="yes" />'."\n";
     foreach my $menudata (@menu) {
-        if ($menudata->{'name'} ne &mt('Verify Receipt')) {
+        if ($menudata->{'name'} ne &mt('Verify Receipt No.')) {
             $Str .='    <h3><a '.
                 $menudata->{'jscript'}.
                 ' href="'.
                 $menudata->{'url'}.'" >'.
                 $menudata->{'name'}."</a></h3>\n";
         } else {
-            $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
+            $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt No.').'" '.
                 $menudata->{'jscript'}.
                 ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
                 ' /> '.