--- loncom/homework/grades.pm	2008/12/24 06:31:41	1.542
+++ loncom/homework/grades.pm	2009/01/06 21:57:06	1.546
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.542 2008/12/24 06:31:41 raeburn Exp $
+# $Id: grades.pm,v 1.546 2009/01/06 21:57:06 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2094,7 +2094,7 @@ KEYWORDS
 			    ' )</span>&nbsp; &nbsp;';
 			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
 			if (@$files) {
-			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />';
+			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
 			    my $file_counter = 0;
 			    foreach my $file (@$files) {
 			        $file_counter++;
@@ -2317,7 +2317,7 @@ sub get_last_submission {
 					$$returnhash{$version.':keys'}))) {
 		$lasthash{$key}=$$returnhash{$version.':'.$key};
 		$timestamp = 
-		    scalar(localtime($$returnhash{$version.':timestamp'}));
+		    &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
 	    }
 	}
 	foreach my $key (keys(%lasthash)) {
@@ -7506,12 +7506,6 @@ SCANTRONFORM
         }
 
 	$completedstudents{$uname}={'line'=>$line};
-        my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
-        my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
-        chomp($studentdata);
-        $studentdata =~ s/\r$//;
-        my $studentrecord = '';
-        my $counter = -1;
         if ($env{'form.verifyrecord'}) {
             my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
             my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
@@ -7566,6 +7560,7 @@ SCANTRONFORM
                 }
             }
         }
+        if (&Apache::loncommon::connection_aborted($r)) { last; }
     } continue {
 	&Apache::lonxml::clear_problem_counter();
 	&Apache::lonnet::delenv('scantron\.');
@@ -7783,7 +7778,7 @@ sub checkscantron_results {
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status',
                                     'Progress of Scantron Data/Submission Records Comparison',$count,
                                     'inline',undef,'checkscantron');
-    my ($username,$domain,$uname,$started);
+    my ($username,$domain,$started);
 
     &Apache::grades::scantron_get_maxbubble();  # Need the bubble lines array to parse.