--- loncom/homework/grades.pm	2003/08/17 18:36:46	1.130.2.1
+++ loncom/homework/grades.pm	2003/09/29 20:58:50	1.130.2.1.2.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.130.2.1 2003/08/17 18:36:46 albertel Exp $
+# $Id: grades.pm,v 1.130.2.1.2.5 2003/09/29 20:58:50 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2800,7 +2800,7 @@ sub getSymbMap {
     my ($request) = @_;
     my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
 						  $ENV{'request.course.fn'}.'_parms.db');
-    $navmap->init();
+#    $navmap->init();
 
     my %symbx = ();
     my @titles = ();
@@ -3146,6 +3146,8 @@ sub getSequenceDropDown {
 }
 
 sub scantron_uploads {
+    #FIXME need to support scantron files put in another location,
+    # maybe the course directory? a scantron dir in the course directory?
     if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
     my $result=	'<select name="scantron_selectfile">';
     opendir(DIR,$Apache::lonnet::perlvar{'lonScansDir'});
@@ -3182,9 +3184,11 @@ sub scantron_selectphase {
     my $file_selector=&scantron_uploads();
     my $format_selector=&scantron_scantab();
     my $result;
+    #FIXME allow instructor to be able to download the scantron file
+    # and to upload it,
     $result.= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
-  <input type="hidden" name="command" value="scantron_process" />
+  <input type="hidden" name="command" value="scantron_validate" />
   $default_form_data
   <table width="100%" border="0">
     <tr>
@@ -3210,11 +3214,18 @@ sub scantron_selectphase {
               Format of data file: $format_selector
 	    </td>
           </tr>
+          <tr bgcolor="#ffffe6">
+            <td>
+<!-- FIXME this is lazy, a single parse of the set should let me know what this is -->
+              Last line to expect an answer on: 
+                <input type="text" name="scantron_maxbubble" />
+	    </td>
+          </tr>
         </table>
       </td>
     </tr>
   </table>
-  <input type="submit" value="Submit" />
+  <input type="submit" value="Validate Scantron Records" />
 </form>
 $grading_menu_button
 SCANTRONFORM
@@ -3226,6 +3237,7 @@ sub get_scantron_config {
     my ($which) = @_;
     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
     my %config;
+    #FIXME probably should move to XML it has already gotten a bit much now
     foreach my $line (<$fh>) {
 	my ($name,$descrip)=split(/:/,$line);
 	if ($name ne $which ) { next; }
@@ -3242,6 +3254,12 @@ sub get_scantron_config {
 	$config{'Qlength'}=$config[8];
 	$config{'Qoff'}=$config[9];
 	$config{'Qon'}=$config[10];
+	$config{'PaperID'}=$config[11];
+	$config{'PaperIDlength'}=$config[12];
+	$config{'FirstName'}=$config[13];
+	$config{'FirstNamelength'}=$config[14];
+	$config{'LastName'}=$config[15];
+	$config{'LastNamelength'}=$config[16];
 	last;
     }
     return %config;
@@ -3257,8 +3275,50 @@ sub username_to_idmap {
     return %idmap;
 }
 
+sub scantron_fixup_scanline {
+    my ($scantron_config,$scan_data,$line,$field,$newvalue,$arg) = @_;
+    if ($field eq 'ID') {
+	if ($newvalue > $$scantron_config{'IDlength'}) {
+	    return ($line,1,'New value to large');
+	}
+	if ($newvalue < $$scantron_config{'IDlength'}) {
+	    $newvalue=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
+			      $newvalue);
+	}
+	substr($line,$$scantron_config{'IDstart'}-1,
+	       $$scantron_config{'IDlength'})=$newvalue;
+    } elsif ($field eq 'answer') {
+	my $length=$scantron_config->{'Qlength'};
+	my $off=$scantron_config->{'Qoff'};
+	my $on=$scantron_config->{'Qon'};
+	my $answer=${off}x$length;
+	if ($arg ne 'none') {
+	    substr($answer,$arg,1)=$on;
+	    &scan_data($scan_data,"no_bubble.$newvalue",undef,'1');
+	} else {
+	    &scan_data($scan_data,"no_bubble.$newvalue",'1');
+	}
+	my $where=$length*($newvalue-1)+$scantron_config->{'Qstart'};
+	Apache->request->print("where $where arg $arg ");
+	Apache->request->print('b:<pre>'.$line.'</pre>');
+	substr($line,$where-1,$length)=$answer;
+	Apache->request->print('a:<pre>'.$line.'</pre>');
+    }
+    return $line;
+}
+
+sub scan_data {
+    my ($scan_data,$key,$value,$delete);
+    my $filename=$ENV{'form.scantron_selectfile'};
+    if (defined($value)) {
+	$scan_data->{$filename.'_'.$key} = $value;
+    }
+    if ($delete) { delete($scan_data->{$filename.'_'.$key}); }
+    return $scan_data->{$filename.'_'.$key};
+}
+
 sub scantron_parse_scanline {
-    my ($line,$scantron_config)=@_;
+    my ($line,$scantron_config,$scan_data)=@_;
     my %record;
     my $questions=substr($line,$$scantron_config{'Qstart'}-1);
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
@@ -3272,6 +3332,15 @@ sub scantron_parse_scanline {
     }
     $record{'scantron.ID'}=substr($data,$$scantron_config{'IDstart'}-1,
 				  $$scantron_config{'IDlength'});
+    $record{'scantron.PaperID'}=
+	substr($data,$$scantron_config{'PaperID'}-1,
+	       $$scantron_config{'PaperIDlength'});
+    $record{'scantron.FirstName'}=
+	substr($data,$$scantron_config{'FirstName'}-1,
+	       $$scantron_config{'FirstNamelength'});
+    $record{'scantron.LastName'}=
+	substr($data,$$scantron_config{'LastName'}-1,
+	       $$scantron_config{'LastNamelength'});
     my @alphabet=('A'..'Z');
     my $questnum=0;
     while ($questions) {
@@ -3279,31 +3348,48 @@ sub scantron_parse_scanline {
 	my $currentquest=substr($questions,0,$$scantron_config{'Qlength'});
 	substr($questions,0,$$scantron_config{'Qlength'})='';
 	if (length($currentquest) < $$scantron_config{'Qlength'}) { next; }
-	my (@array)=split(/$$scantron_config{'Qon'}/,$currentquest);
-	if (scalar(@array) gt 2) {
-	    #FIXME do something intelligent with double bubbles
-	    Apache->request->print("<br ><b>Wha!!!</b> <pre>".scalar(@array).
-				   '-'.$currentquest.'-'.$questnum.'</pre><br />');
-	}
+	my @array=split($$scantron_config{'Qon'},$currentquest,-1);
 	if (length($array[0]) eq $$scantron_config{'Qlength'}) {
 	    $record{"scantron.$questnum.answer"}='';
+	    if (!&scan_data($scan_data,"no_bubble.$questnum")) {
+		push(@{$record{"scantron.missingerror"}},$questnum);
+	    }
 	} else {
 	    $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
 	}
+	if (scalar(@array) gt 2) {
+	    push(@{$record{'scantron.doubleerror'}},$questnum);
+	    my @ans=@array;
+	    my $i=length($ans[0]);shift(@ans);
+	    while (@ans) {
+		$i+=length($ans[0])+1;
+		$record{"scantron.$questnum.answer"}.=$alphabet[$i];
+		shift(@ans);
+	    }
+	}
     }
     $record{'scantron.maxquest'}=$questnum;
     return \%record;
 }
 
 sub scantron_add_delay {
+    my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
+    Apache->request->print('add_delay_error '.$_[2] );
+    push(@$delayqueue,
+	 {'line' => $scanline, 'emsg' => $errormessage,
+	  'ecode' => $errorcode }
+	 );
 }
 
 sub scantron_find_student {
     my ($scantron_record,$idmap)=@_;
     my $scanID=$$scantron_record{'scantron.ID'};
     foreach my $id (keys(%$idmap)) {
-	Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
-	if (lc($id) eq lc($scanID)) { Apache->request->print('success');return $$idmap{$id}; }
+	#Apache->request->print('<pre>checking studnet -'.$id.'- againt -'.$scanID.'- </pre>');
+	if (lc($id) eq lc($scanID)) {
+	    #Apache->request->print('success');
+	    return $$idmap{$id};
+	}
     }
     return undef;
 }
@@ -3316,6 +3402,363 @@ sub scantron_filter {
     return 0;
 }
 
+#FIXME I think I am doing this in the wrong order, I think it would be
+#better to make a several passes analyzing all of the lines in the
+#file for common errors wrong/invalid PID/username duplicated
+#PID/username, missing bubbles, double bubbles, missing/invalid CODE
+#and then get the instructor to fix all of these errors, then grade
+#the corrected one, I'll still need to catch error conditions, but
+#maybe most will taken care even before we start
+
+sub scantron_process_corrections {
+    my ($r) = @_;
+    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    my ($scanlines,$scan_data)=&scantron_getfile();
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    my $which=$ENV{'form.scantron_line'};
+    my $line=&scantron_get_line($scanlines,$which);
+    my ($skip,$err,$errmsg);
+    if ($ENV{'form.scantron_skip_record'}) {
+	$skip=1;
+    } elsif ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
+	my $newstudent=$ENV{'form.scantron_username'}.':'.
+	    $ENV{'form.scantron_domain'};
+	my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
+	($line,$err,$errmsg)=
+	    &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,'ID',
+				     $newid);
+    } elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
+	foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
+	    ($line,$err,$errmsg)=
+		&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
+					 'answer',$question,
+				    $ENV{"form.scantron_correct_Q_$question"});
+	    if ($err) { last; }
+	}
+    }
+    if ($err) {
+	$r->print("Unable to accept last correction, an error occurred :$errmsg:");
+    } else {
+	&scantron_put_line($scanlines,$which,$line,$skip);
+	&scantron_putfile($scanlines,$scan_data);
+    }
+}
+
+
+sub scantron_validate_file {
+    my ($r) = @_;
+    my ($symb,$url)=&get_symb_and_url($r);
+    if (!$symb) {return '';}
+    my $default_form_data=&defaultFormData($symb,$url);
+
+    if ($ENV{'form.scantron_corrections'}) {
+	&scantron_process_corrections($r);
+    }
+    #get the student pick code ready
+    $r->print(&Apache::loncommon::studentbrowser_javascript());
+    my $result= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+  <input type="hidden" name="command" value="scantron_validate" />
+  <input type="hidden" name="selectpage" value="$ENV{'form.selectpage'}" />
+  <input type="hidden" name="scantron_format" value="$ENV{'form.scantron_format'}" />
+  <input type="hidden" name="scantron_selectfile" value="$ENV{'form.scantron_selectfile'}" />
+  <input type="hidden" name="scantron_maxbubble" value="$ENV{'form.scantron_maxbubble'}" />
+  $default_form_data
+SCANTRONFORM
+    $r->print($result);
+    
+    my @validate_phases=( 'ID',
+			  'CODE',
+			  'doublebubble',
+			  'missingbubbles');
+    if (!$ENV{'form.validatepass'}) {
+	$ENV{'form.valiadatepass'} = 0;
+    }
+    my $currentphase=$ENV{'form.valiadatepass'};
+
+    if ($ENV{'form.scantron_selectfile'}=~m-^/-) {
+	#first pass copy file to classdir
+	
+    }
+    my $stop=0;
+    while (!$stop && $currentphase < scalar(@validate_phases)) {
+	my $which="scantron_validate_".$validate_phases[$currentphase];
+	{
+	    no strict 'refs';
+	    ($stop,$currentphase)=&$which($r,$currentphase);
+	}
+    }
+    $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+    return '';
+}
+
+sub scantron_getfile {
+    #my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
+    #FIXME really would prefer a scantron directory but tokenwrapper
+    # doesn't allow access to subdirs of userfiles
+    my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $lines;
+    $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+		       'scantron_orig_'.$ENV{'form.scantron_selectfile'});
+    if ($lines eq '-1') {
+       #FIXME need to actually replicate file to course space
+    }
+    my %scanlines;
+    $scanlines{'orig'}=[split("\n",$lines)];
+    my $temp=$scanlines{'orig'};
+    $scanlines{'count'}=$#$temp;
+
+    $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+		       'scantron_corrected_'.$ENV{'form.scantron_selectfile'});
+    if ($lines eq '-1') {
+	$scanlines{'corrected'}=[];
+    } else {
+	$scanlines{'corrected'}=[split("\n",$lines)];
+    }
+    $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
+		       'scantron_skipped_'.$ENV{'form.scantron_selectfile'});
+    if ($lines eq '-1') {
+	$scanlines{'skipped'}=[];
+    } else {
+	$scanlines{'skipped'}=[split("\n",$lines)];
+    }
+    my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname);
+    if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); }
+    my %scan_data = @tmp;
+    return (\%scanlines,\%scan_data);
+}
+
+sub lonnet_putfile {
+    my ($contents,$filename)=@_;
+    my $docuname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $docudom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $docuhome=$ENV{'course.'.$ENV{'request.course.id'}.'.home'};
+    $ENV{'form.sillywaytopassafilearound'}=$contents;
+    &Apache::lonnet::finishuserfileupload($docuname,$docudom,$docuhome,'sillywaytopassafilearound',$filename);
+
+}
+
+sub scantron_putfile {
+    my ($scanlines,$scan_data) = @_;
+    #FIXME really would prefer a scantron directory but tokenwrapper
+    # doesn't allow access to subdirs of userfiles
+    my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $prefix='scantron_';
+# no need to update orig, shouldn't change
+#   &lonnet_putfile(join("\n",@{$scanlines->{'orig'}}),$prefix.'orig_'.
+#		    $ENV{'form.scantron_selectfile'});
+    &lonnet_putfile(join("\n",@{$scanlines->{'corrected'}}),
+		    $prefix.'corrected_'.
+		    $ENV{'form.scantron_selectfile'});
+    &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
+		    $prefix.'skipped_'.
+		    $ENV{'form.scantron_selectfile'});
+    &Apache::lonnet::put('scantrondata',$scan_data,$cdom,$cname);
+}
+
+sub scantron_get_line {
+    my ($scanlines,$i)=@_;
+    if ($scanlines->{'skipped'}[$i]) {return undef;}
+    if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
+    return $scanlines->{'orig'}[$i]; 
+}
+
+sub scantron_put_line {
+    my ($scanlines,$i,$newline,$skip)=@_;
+    if ($skip) { $scanlines->{'skipped'}[$i]=$newline;return; }
+    $scanlines->{'corrected'}[$i]=$newline;
+}
+
+sub scantron_validate_ID {
+    my ($r,$currentphase) = @_;
+    
+    #get student info
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    my %idmap=&username_to_idmap($classlist);
+
+    #get scantron line setup
+    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    my ($scanlines,$scan_data)=&scantron_getfile();
+
+    my %found=('ids'=>{},'usernames'=>{});
+    for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+	my $line=&scantron_get_line($scanlines,$i);
+	if (!$line) { next; }
+	my $scan_record=&scantron_parse_scanline($line,\%scantron_config,$scan_data);
+	my $id=$$scan_record{'scantron.ID'};
+	$r->print("<p>Checking ID ".$$scan_record{'scantron.ID'}.
+		  " on paper ID ".$$scan_record{'scantron.PaperID'}."</p>\n");
+	my $found;
+	foreach my $checkid (keys(%idmap)) {
+	    if (lc($checkid) eq lc($id)) {
+		if ($checkid ne $id) {
+		    $r->print("<p>Using $checkid for encoded $id</p>\n");
+		}
+		$found=$checkid;last;
+	    }
+	}
+	if ($found) {
+	    if ($found{'ids'}{$found}) {
+		#FIXME store away line we prviously saw the ID on
+		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+					 $line,'duplicateID',$found);
+		return(1);
+	    } else {
+		$found{'ids'}{$found}++;
+	    }
+	} else {
+	    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+				     $line,'incorrectID');
+	    return(1);
+	}
+    }
+
+    return (0,$currentphase+1);
+}
+
+sub scantron_get_correction {
+    my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
+
+#FIXME in the case of a duplicated ID the previous line, probaly need
+#to show both the current line and the previous one and allow skipping
+#the previous one or the current one
+
+    $r->print("<p>This scantron record has an error ($error). ");
+    if ( defined($$scan_record{'scantron.PaperID'}) ) {
+	$r->print("The current PaperID is <tt>".
+		  $$scan_record{'scantron.PaperID'}."</tt> \n");
+    } else {
+	$r->print("The current scanline is <pre>".
+		  $line."</pre> \n");
+    }
+    $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
+    $r->print('<input type="hidden" name="scantron_line" value="'.$i.'" />'."\n");
+    if ($error =~ /ID$/) {
+	if ($error eq 'unknownID') {
+	    $r->print("The encoded ID is not in the classlist</p>\n");
+	} elsif ($error eq 'duplicateID') {
+	    $r->print("The encoded ID has also been used by a previous paper $arg</p>\n");
+	}
+	$r->print("<p>Original ID is <tt>".$$scan_record{'scantron.ID'}.
+		  "</tt><br />\n");
+	$r->print("Name on paper is ".$$scan_record{'scantron.LastName'}.",".
+		  $$scan_record{'scantron.FirstName'}."</p>");
+	$r->print("<p>Please correct <br /> \n");
+	$r->print("\n<ul><li> Pick a specific user -- username:<input type='text' name='scantron_username' value='' />");
+	$r->print("\ndomain:".
+		 &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
+	#FIXME it would be nice if this sent back the user ID and
+	#could do partial userID matches
+	$r->print(&Apache::loncommon::selectstudent_link('scantronupload',
+				      'scantron_username','scantron_domain'));
+	$r->print('</li>');
+    } elsif ($error eq 'doublebubble') {
+	$r->print("There have been multiple bubbles scanned for a single question\n");
+	$r->print('<input type="hidden" name="scantron_questions" value="'.
+		  join(',',@{$arg}).'" />');
+	foreach my $question (@{$arg}) {
+	    my $selected=$$scan_record{"scantron.$question.answer"};
+	    $r->print("<p> For question $question, selected bubbles were ".
+		      join(" ",split('',$selected)).
+              " <br />Please pick which one should be used for grading<br />");
+	    &scantron_bubble_selector($r,$scan_config,$question);
+	}
+    } elsif ($error eq 'missingbubble') {
+	$r->print("Some questions have no scanned bubbles\n");
+	$r->print('<input type="hidden" name="scantron_questions" value="'.
+		  join(',',@{$arg}).'" />');
+	foreach my $question (@{$arg}) {
+	    my $selected=$$scan_record{"scantron.$question.answer"};
+	    $r->print("<p>Question $question, Please select a bubble to use ");
+	    &scantron_bubble_selector($r,$scan_config,$question);
+	}
+    } else {
+	$r->print("\n<ul>");
+    }
+    $r->print("<li>Skip this scanline saving it for later  ");
+    $r->print("\n<input type='checkbox' name='scantron_skip_record' /> </li></ul>");
+    &scantron_end_validate_form($r);
+}
+
+sub scantron_bubble_selector {
+    my ($r,$scan_config,$quest)=@_;
+    my $max=$$scan_config{'Qlength'};
+    my @alphabet=('A'..'Z');
+    for (my $i=0;$i<$max;$i++) {
+	$r->print('<input type="radio" name="scantron_correct_Q_'.$quest.
+		  '" value="'.$i.'" />'.$alphabet[$i]);
+    }
+    $r->print('<input type="radio" name="scantron_correct_Q_'.$quest.
+	      '" value="none" /> Nothing');
+    $r->print('<br />');
+}
+
+sub scantron_validate_CODE {
+    my ($r,$currentphase) = @_;
+    #FIXME doesn't do anything yet
+    return (0,$currentphase+1);
+}
+
+sub scantron_validate_doublebubble {
+    my ($r,$currentphase) = @_;
+    #get student info
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    my %idmap=&username_to_idmap($classlist);
+
+    #get scantron line setup
+    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    my ($scanlines,$scan_data)=&scantron_getfile();
+    for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+	my $line=&scantron_get_line($scanlines,$i);
+	if (!$line) { next; }
+	my $scan_record=&scantron_parse_scanline($line,\%scantron_config,$scan_data);
+	if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
+	&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
+				 'doublebubble',
+				 $$scan_record{'scantron.doubleerror'});
+    	return (1,$currentphase);
+    }
+    return (0,$currentphase+1);
+}
+
+sub scantron_validate_missingbubbles {
+    my ($r,$currentphase) = @_;
+    #get student info
+    my $classlist=&Apache::loncoursedata::get_classlist();
+    my %idmap=&username_to_idmap($classlist);
+
+    #get scantron line setup
+    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    my ($scanlines,$scan_data)=&scantron_getfile();
+    my $max_bubble=$ENV{'form.scantron_maxbubble'};
+    if (!$max_bubble) { $max_bubble=2**31; }
+    for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+	my $line=&scantron_get_line($scanlines,$i);
+	if (!$line) { next; }
+	my $scan_record=&scantron_parse_scanline($line,\%scantron_config,$scan_data);
+	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
+	my @to_correct;
+	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
+	    if ($missing gt $max_bubble) { next; }
+	    push(@to_correct,$missing);
+	}
+	if (@to_correct) {
+	    &scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+				     $line,'missingbubble',\@to_correct);
+	    return (1,$currentphase);
+	}
+
+    }
+    return (0,$currentphase+1);
+}
+
+sub scantron_end_validate_form {
+    my ($r) = @_;
+    $r->print('<input type="submit" name="submit" /></form></body></html>');
+}
+
 sub scantron_process_students {
     my ($r) = @_;
     my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
@@ -3324,14 +3767,13 @@ sub scantron_process_students {
     my $default_form_data=&defaultFormData($symb,$url);
 
     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
-    my $scanlines=Apache::File->new($Apache::lonnet::perlvar{'lonScansDir'}."/$ENV{'form.scantron_selectfile'}");
-    my @scanlines=<$scanlines>;
+    my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
     my $navmap=Apache::lonnavmaps::navmap->new($ENV{'request.course.fn'}.'.db',$ENV{'request.course.fn'}.'_parms.db',1, 1);
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
-    $r->print("geto ".scalar(@resources)."<br />");
+#    $r->print("geto ".scalar(@resources)."<br />");
     my $result= <<SCANTRONFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
   <input type="hidden" name="command" value="scantron_configphase" />
@@ -3340,29 +3782,38 @@ SCANTRONFORM
     $r->print($result);
 
     my @delayqueue;
-    my $totalcorrect;
-    my $totalincorrect;
-
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,
-	           'Scantron Status','Scantron Progress',scalar(@scanlines));
-    foreach my $line (@scanlines) {
-	my $studentcorrect;
-	my $studentincorrect;
-
-	chomp($line);
-	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
+    my %completedstudents;
+    
+    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
+				    'Scantron Progress',$scanlines->{'count'});
+    &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+					  'Processing first student');
+    my $start=&Time::HiRes::time();
+    my $i=0;
+    while ($i<=$scanlines->{'count'}) {
+	$i++;
+	my $line=&scantron_get_line($scanlines,$i);
+	if (!$line) { next; }
+	$r->print('<pre>line is'.$line.'</pre>');
+	my $scan_record=&scantron_parse_scanline($line,\%scantron_config,$scan_data);
 	my ($uname,$udom);
-	if ($uname=&scantron_find_student($scan_record,\%idmap)) {
+	unless ($uname=&scantron_find_student($scan_record,\%idmap)) {
 	    &scantron_add_delay(\@delayqueue,$line,
-				'Unable to find a student that matches');
+				'Unable to find a student that matches',1);
+	    next;
+	}
+	if (exists $completedstudents{$uname}) {
+	    &scantron_add_delay(\@delayqueue,$line,
+				'Student '.$uname.' has multiple sheets',2);
+	    next;
 	}
 	$r->print('<pre>doing studnet'.$uname.'</pre>');
 	($uname,$udom)=split(/:/,$uname);
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonnet::appenv(%$scan_record);
 #    &Apache::lonhomework::showhash(%ENV);
-    $Apache::lonxml::debug=1;
-	&Apache::lonxml::debug("line is $line");
+#    $Apache::lonxml::debug=1;
+#	&Apache::lonxml::debug("line is $line");
 	
 	    my $i=0;
 	foreach my $resource (@resources) {
@@ -3374,31 +3825,31 @@ SCANTRONFORM
 				  'grade_domain'  =>$udom,
 				  'grade_courseid'=>$ENV{'request.course.id'},
 				  'grade_symb'    =>$resource->symb()));
-	    my %score=&Apache::lonnet::restore($resource->symb(),
-					       $ENV{'request.course.id'},
-					       $udom,$uname);
-	    foreach my $part ($resource->{PARTS}) {
-		if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
-		    $studentcorrect++;
-		    $totalcorrect++;
-		} else {
-		    $studentincorrect++;
-		    $totalincorrect++;
-		}
-	    }
-	    $r->print('<pre>'.
-		      $resource->symb().'-'.
-		      $resource->src().'-'.'</pre>result is'.$result);
-	    &Apache::lonhomework::showhash(%score);
+#	    my %score=&Apache::lonnet::restore($resource->symb(),
+#					       $ENV{'request.course.id'},
+#					       $udom,$uname);
+#	    foreach my $part ($resource->{PARTS}) {
+#		if ($score{'resource.'.$part.'.solved'} =~ /^correct/) {
+#		    $studentcorrect++;
+#		    $totalcorrect++;
+#		} else {
+#		    $studentincorrect++;
+#		    $totalincorrect++;
+#		}
+#	    }
+#	    $r->print('<pre>'.
+#		      $resource->symb().'-'.
+#		      $resource->src().'-'.'</pre>result is'.$result);
+#	    &Apache::lonhomework::showhash(%score);
 	#    if ($i eq 3) {last;}
 	}
+	$completedstudents{$uname}={'line'=>$line};
+    } continue {
 	&Apache::lonnet::delenv('form.counter');
 	&Apache::lonnet::delenv('scantron\.');
 	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
-             'last student Who got a '.$studentcorrect.' correct and '.
-	     $studentincorrect.' incorrect. The class has gotten '.
-             $totalcorrect.' correct and '.$totalincorrect.' incorrect');
-	last;
+						 'last student');
+	#last;
 	#FIXME
 	#get iterator for $sequence
 	#foreach question 'submit' the students answer to the server
@@ -3406,7 +3857,11 @@ SCANTRONFORM
 	#   generate data to pass back that includes grade recevied
 	#}
     }
-    $Apache::lonxml::debug=0;
+    &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+    my $lasttime = &Time::HiRes::time()-$start;
+    $r->print("<p>took $lasttime</p>");
+
+    #$Apache::lonxml::debug=0;
     foreach my $delay (@delayqueue) {
 	#FIXME
 	#print out each delayed student with interface to select how
@@ -3689,6 +4144,8 @@ sub handler {
 	    }
 	} elsif ($command eq 'scantron_selectphase' && $perm{'mgr'}) {
 	    $request->print(&scantron_selectphase($request));
+	} elsif ($command eq 'scantron_validate' && $perm{'mgr'}) {
+	    $request->print(&scantron_validate_file($request));
 	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
 	    $request->print(&scantron_process_students($request));
 	} elsif ($command) {