--- loncom/homework/grades.pm	2003/09/27 01:59:10	1.130.2.1.2.4
+++ loncom/homework/grades.pm	2003/12/11 13:51:09	1.170
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.130.2.1.2.4 2003/09/27 01:59:10 albertel Exp $
+# $Id: grades.pm,v 1.170 2003/12/11 13:51:09 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -48,6 +48,7 @@ use Apache::lonhomework;
 use Apache::loncoursedata;
 use Apache::lonmsg qw(:user_normal_msg);
 use Apache::Constants qw(:common);
+use Apache::lonlocal;
 use String::Similarity;
 
 my %oldessays=();
@@ -55,17 +56,35 @@ my %perm=();
 
 # ----- These first few routines are general use routines.----
 #
-# --- Retrieve the parts that matches stores_\d+ from the metadata file.---
+# --- Retrieve the parts from the metadata file.---
 sub getpartlist {
-    my ($url) = @_;
-    my @parts =();
-    my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
-    foreach my $key (@metakeys) {
-	if ( $key =~ m/stores_(\w+)_.*/) {
-	    push(@parts,$key);
+    my ($url,$symb) = @_;
+    my $partorder = &Apache::lonnet::metadata($url, 'partorder');
+    my @parts;
+    if ($partorder) {
+	for my $part (split (/,/,$partorder)) {
+	    if (!&Apache::loncommon::check_if_partid_hidden($part,$symb)) {
+		push(@parts, $part);
+	    }
+	}	    
+    } else {
+	my $metadata = &Apache::lonnet::metadata($url, 'packages');
+	foreach (split(/\,/,$metadata)) {
+	    if ($_ =~ /^part_(.*)$/) {
+		if (!&Apache::loncommon::check_if_partid_hidden($1,$symb)) {
+		    push(@parts, $1);
+		}
+	    }
+	}
+    }
+    my @stores;
+    foreach my $part (@parts) {
+	my (@metakeys) = split(/,/,&Apache::lonnet::metadata($url,'keys'));
+	foreach my $key (@metakeys) {
+	    if ($key =~ m/^stores_\Q$part\E_/) { push(@stores,$key); }
 	}
     }
-    return @parts;
+    return @stores;
 }
 
 # --- Get the symbolic name of a problem and the url
@@ -114,65 +133,152 @@ sub response_type {
     my ($url,$symb) = shift;
     $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
     my $allkeys = &Apache::lonnet::metadata($url,'keys');
+    my %vPart;
+    foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+	$vPart{$partid}=1;
+    }
     my %seen = ();
-    my (@partlist,%handgrade);
+    my (@partlist,%handgrade,%responseType);
     foreach (split(/,/,&Apache::lonnet::metadata($url,'packages'))) {
-	if (/^\w+response_\w+.*/) {
+	if (/^\w+response_.*/) {
 	    my ($responsetype,$part) = split(/_/,$_,2);
 	    my ($partid,$respid) = split(/_/,$part);
+	    if (&Apache::loncommon::check_if_partid_hidden($partid,$symb)) {
+		next;
+	    }
+	    if (%vPart && !exists($vPart{$partid})) {
+		next;
+	    }
 	    $responsetype =~ s/response$//; # make it compatible w/ navmaps - should move to that!!
 	    my ($value) = &Apache::lonnet::EXT('resource.'.$part.'.handgrade',$symb);
-	    $handgrade{$part} = $responsetype.':'.($value eq 'yes' ? 'yes' : 'no'); 
+	    $handgrade{$part} = ($value eq 'yes' ? 'yes' : 'no'); 
+	    if (!exists($responseType{$partid})) { $responseType{$partid}={}; }
+	    $responseType{$partid}->{$respid}=$responsetype;
 	    next if ($seen{$partid} > 0);
 	    $seen{$partid}++;
 	    push @partlist,$partid;
 	}
     }
-    return \@partlist,\%handgrade;
+    return \@partlist,\%handgrade,\%responseType;
 }
 
 #--- Show resource title
 #--- and parts and response type
 sub showResourceInfo {
-    my ($url,$probTitle) = @_;
+    my ($url,$probTitle,$checkboxes) = @_;
+    my $col=3;
+    if ($checkboxes) { $col=4; }
     my $result ='<table border="0">'.
-	'<tr><td colspan=3><font size=+1><b>Current Resource: </b>'.$probTitle.'</font></td></tr>'."\n";
-    my ($partlist,$handgrade) = &response_type($url);
+	'<tr><td colspan="'.$col.'"><font size="+1"><b>'.&mt('Current Resource').': </b>'.
+	$probTitle.'</font></td></tr>'."\n";
+    my ($partlist,$handgrade,$responseType) = &response_type($url);
     my %resptype = ();
     my $hdgrade='no';
-    for (sort keys(%$handgrade)) {
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
-	my $partID = (split(/_/))[0];
-	$resptype{$partID} = $responsetype;
+    my %partsseen;
+    for my $part_resID (sort keys(%$handgrade)) {
+	my $handgrade=$$handgrade{$part_resID};
+	my ($partID,$resID) = split(/_/,$part_resID);
+	my $responsetype = $responseType->{$partID}->{$resID};
 	$hdgrade = $handgrade if ($handgrade eq 'yes');
-	$result.='<tr><td><b>Part </b>'.$partID.'</td>'.
+	$result.='<tr>';
+	if ($checkboxes) {
+	    if (exists($partsseen{$partID})) {
+		$result.="<td>&nbsp;</td>";
+	    } else {
+		$result.="<td><input type='checkbox' name='vPart' value='$partID' checked='on' /></td>";
+	    }
+	    $partsseen{$partID}=1;
+	}
+	$result.='<td><b>Part </b>'.$partID.' <font color="#999999">'.
+	    $resID.'</font></td>'.
 	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
 #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
     }
     $result.='</table>'."\n";
-    return $result,\%resptype,$hdgrade,$partlist,$handgrade;
+    return $result,$responseType,$hdgrade,$partlist,$handgrade;
 }
 
+
+sub get_order {
+    my ($partid,$respid,$symb,$uname,$udom)=@_;
+    my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
+    $url=&Apache::lonnet::clutter($url);
+    my $subresult=&Apache::lonnet::ssi($url,
+				       ('grade_target' => 'analyze'),
+				       ('grade_domain' => $udom),
+				       ('grade_symb' => $symb),
+				       ('grade_courseid' => 
+					        $ENV{'request.course.id'}),
+				       ('grade_username' => $uname));
+    (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
+    my %analyze=&Apache::lonnet::str2hash($subresult);
+    return ($analyze{"$partid.$respid.shown"});
+}
 #--- Clean response type for display
-#--- Currently filters option response type only.
+#--- Currently filters option/rank/radiobutton/match/essay response types only.
 sub cleanRecord {
-    my ($answer,$response,$symb) = @_;
-    if ($response eq 'option') {
-	my (@IDs,@ans);
-	foreach (split(/\&/,&Apache::lonnet::unescape($answer))) {
-	    my ($optionID,$ans) = split(/=/);
-	    push @IDs,$optionID.'</font>';
-	    push @ans,$ans;
+    my ($answer,$response,$symb,$partid,$respid,$record,$order,$version) = @_;
+    my $grayFont = '<font color="#999999">';
+    if ($response =~ /^(option|rank)$/) {
+	my %answer=&Apache::lonnet::str2hash($answer);
+	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+	my ($toprow,$bottomrow);
+	foreach my $foil (@$order) {
+	    if ($grading{$foil} == 1) {
+		$toprow.='<td><b>'.$answer{$foil}.'&nbsp;</b></td>';
+	    } else {
+		$toprow.='<td><i>'.$answer{$foil}.'&nbsp;</i></td>';
+	    }
+	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
 	}
-	my $grayFont = '<font color="#999999">';
 	return '<blockquote><table border="1">'.
-	    '<tr valign="top"><td>Answer</td><td>'.
-	    (join '</td><td>',@ans).'</td></tr>'.
-	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td><td>'.$grayFont.
-	    (join '</td><td>'.$grayFont,@IDs).'</font></td></tr>'.
-	    '</table></blockquote>';
-    }
-    if ($response eq 'essay') {
+	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+    } elsif ($response eq 'match') {
+	my %answer=&Apache::lonnet::str2hash($answer);
+	my %grading=&Apache::lonnet::str2hash($record->{$version."resource.$partid.$respid.submissiongrading"});
+	my @items=&Apache::lonnet::str2array($record->{$version."resource.$partid.$respid.submissionitems"});
+	my ($toprow,$middlerow,$bottomrow);
+	foreach my $foil (@$order) {
+	    my $item=shift(@items);
+	    if ($grading{$foil} == 1) {
+		$toprow.='<td><b>'.$item.'&nbsp;</b></td>';
+		$middlerow.='<td><b>'.$grayFont.$answer{$foil}.'&nbsp;</font></b></td>';
+	    } else {
+		$toprow.='<td><i>'.$item.'&nbsp;</i></td>';
+		$middlerow.='<td><i>'.$grayFont.$answer{$foil}.'&nbsp;</font></i></td>';
+	    }
+	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	}
+	return '<blockquote><table border="1">'.
+	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Item ID</font></td>'.
+	    $middlerow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    $bottomrow.'</tr>'.'</table></blockquote>';
+    } elsif ($response eq 'radiobutton') {
+	my %answer=&Apache::lonnet::str2hash($answer);
+	my ($toprow,$bottomrow);
+	my $correct=($order->[0])+1;
+	for (my $i=1;$i<=$#$order;$i++) {
+	    my $foil=$order->[$i];
+	    if (exists($answer{$foil})) {
+		if ($i == $correct) {
+		    $toprow.='<td><b>true</b></td>';
+		} else {
+		    $toprow.='<td><i>true</i></td>';
+		}
+	    } else {
+		$toprow.='<td>false</td>';
+	    }
+	    $bottomrow.='<td>'.$grayFont.$foil.'</font>&nbsp;</td>';
+	}
+	return '<blockquote><table border="1">'.
+	    '<tr valign="top"><td>Answer</td>'.$toprow.'</tr>'.
+	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
+	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
+    } elsif ($response eq 'essay') {
 	if (! exists ($ENV{'form.'.$symb})) {
 	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
 						  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
@@ -185,7 +291,8 @@ sub cleanRecord {
 	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
 	    $ENV{'form.'.$symb} = 1; # so that we don't have to read it from disk for multiple sub of the same prob.
 	}
-	return '<br /><br /><blockquote>'.&keywords_highlight($answer).'</blockquote>';
+	$answer =~ s-\n-<br />-g;
+	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
     }
     return $answer;
 }
@@ -218,7 +325,8 @@ sub commonJSfunctions {
 		}
 	    }
 	} else {
-	    if (selectOne.selected) return selectOne.value;
+            // only one value it must be the selected one
+	    return selectOne.value;
 	}
     }
 </script>
@@ -464,8 +572,7 @@ sub listStudents {
     my $result='<h3><font color="#339933">&nbsp;'.$viewgrade.
 	' Submissions for a Student or a Group of Students</font></h3>';
 
-    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'});
-    $result.=$table;
+    my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($url,$ENV{'form.probTitle'},($ENV{'form.showgrading'} eq 'yes'));
 
     $request->print(<<LISTJAVASCRIPT);
 <script type="text/javascript" language="javascript">
@@ -505,10 +612,14 @@ LISTJAVASCRIPT
 
     my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
     my $checklastsub = $checkhdgrade eq '' ? 'checked' : '';
-    my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'."\n".
-	'&nbsp;<b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+    my $gradeTable='<form action="/adm/grades" method="post" name="gradesub">'.
+	"\n".$table.
+	'&nbsp;<b>View Problem Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
 	'<input type="radio" name="vProb" value="yes" /> one student '."\n".
 	'<input type="radio" name="vProb" value="all" /> all students <br />'."\n".
+	'&nbsp;<b>View Answer: </b><input type="radio" name="vAns" value="no"  /> no '."\n".
+	'<input type="radio" name="vAns" value="yes" /> one student '."\n".
+	'<input type="radio" name="vAns" value="all" checked="on" /> all students <br />'."\n".
 	'&nbsp;<b>Submissions: </b>'."\n";
     if ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
 	$gradeTable.='<input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only'."\n";
@@ -517,8 +628,8 @@ LISTJAVASCRIPT
     my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
     $ENV{'form.Status'} = $saveStatus;
 
-    $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last sub only'."\n".
-	'<input type="radio" name="lastSub" value="last" /> last sub & parts info'."\n".
+    $gradeTable.='<input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only'."\n".
+	'<input type="radio" name="lastSub" value="last" /> last submission & parts info'."\n".
 	'<input type="radio" name="lastSub" value="datesub" /> by dates and submissions'."\n".
 	'<input type="radio" name="lastSub" value="all" /> all details'."\n".
 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
@@ -544,7 +655,7 @@ LISTJAVASCRIPT
     $gradeTable.='<input type="button" '."\n".
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '."\n".
 	'value="Next->" />'."\n";
-
+    $gradeTable.='<input type="checkbox" name="checkPlag" checked="on">Check For Plagiarism</input>';
     my (undef, undef, $fullname) = &getclasslist($getsec,'1');  
     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">';
@@ -568,18 +679,26 @@ LISTJAVASCRIPT
 	my %status = ();
 	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 	    (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
-	    my $statusflg = '';
+	    my $submitted = 0;
+	    my $graded = 0;
 	    foreach (keys(%status)) {
-		$statusflg = 1 if ($status{$_} ne 'nothing');
+		$submitted = 1 if ($status{$_} ne 'nothing');
+		$graded = 1 if ($status{$_} !~ /^correct/);
+
 		my ($foo,$partid,$foo1) = split(/\./,$_);
 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
-		    $statusflg = '';
+		    $submitted = 0;
+		    my ($part)=split(/\./,$partid);
 		    $gradeTable.='<input type="hidden" name="'.
-			$student.':submitted_by" value="'.
+			$student.':'.$part.':submitted_by" value="'.
 			$status{'resource.'.$partid.'.submitted_by'}.'" />';
 		}
 	    }
-	    next if ($statusflg eq '' && $submitonly eq 'yes');
+	    next if (!$submitted && ($submitonly eq 'yes' ||
+				     $submitonly eq 'incorrect' ||
+				     $submitonly eq 'graded'));
+	    next if (!$graded && ($submitonly eq 'graded' ||
+				  $submitonly eq 'incorrect'));
 	}
 
 	$ctr++;
@@ -621,7 +740,7 @@ LISTJAVASCRIPT
 	} else {
 	    $gradeTable='<br />&nbsp;<font color="red">'.
 		'No submissions found for this resource for any students. ('.$num_students.
-		' checked for submissions</font><br />';
+		' checked for submissions)</font><br />';
 	}
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
@@ -636,8 +755,7 @@ LISTJAVASCRIPT
 sub processGroup {
     my ($request)  = shift;
     my $ctr        = 0;
-    my @stuchecked = (ref($ENV{'form.stuinfo'}) ? @{$ENV{'form.stuinfo'}}
-		      : ($ENV{'form.stuinfo'}));
+    my @stuchecked = &Apache::loncommon::get_env_multiple('form.stuinfo');
     my $total      = scalar(@stuchecked)-1;
 
     foreach (@stuchecked) {
@@ -1195,27 +1313,46 @@ sub gradeBox {
 }
 
 sub show_problem {
-    my ($request,$symb,$uname,$udom,$removeform,$viewon) = @_;
-    my $rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
-						      $ENV{'request.course.id'});
+    my ($request,$symb,$uname,$udom,$removeform,$viewon,$mode) = @_;
+    my $rendered;
+    if ($mode eq 'both' or $mode eq 'text') {
+	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
+					     $ENV{'request.course.id'});
+    }
     if ($removeform) {
 	$rendered=~s|<form(.*?)>||g;
 	$rendered=~s|</form>||g;
 	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
     }
-    my $companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
-							   $ENV{'request.course.id'});
+    my $companswer;
+    if ($mode eq 'both' or $mode eq 'answer') {
+	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
+						    $ENV{'request.course.id'});
+    }
     if ($removeform) {
 	$companswer=~s|<form(.*?)>||g;
 	$companswer=~s|</form>||g;
-	$rendered=~s|name="submit"|name="would_have_been_submit"|g;
+	$companswer=~s|name="submit"|name="would_have_been_submit"|g;
     }
     my $result.='<table border="0" width="100%"><tr><td bgcolor="#777777">';
     $result.='<table border="0" width="100%">';
-    $result.='<tr><td bgcolor="#e6ffff"><b> View of the problem - '.$ENV{'form.fullname'}.
-	'</b></td></tr>' if ($viewon);
-    $result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
-    $result.='<b>Correct answer:</b><br />'.$companswer;
+    if ($viewon) {
+	$result.='<tr><td bgcolor="#e6ffff"><b> ';
+	if ($mode eq 'both' or $mode eq 'text') {
+	    $result.='View of the problem - ';
+	} else {
+	    $result.='Correct answer: ';
+	}
+	$result.=$ENV{'form.fullname'}.'</b></td></tr>';
+    }
+    if ($mode eq 'both') {
+	$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
+	$result.='<b>Correct answer:</b><br />'.$companswer;
+    } elsif ($mode eq 'text') {
+	$result.='<tr><td bgcolor="#ffffff">'.$rendered;
+    } elsif ($mode eq 'answer') {
+	$result.='<tr><td bgcolor="#ffffff">'.$companswer;
+    }
     $result.='</td></tr></table>';
     $result.='</td></tr></table><br />';
     return $result;
@@ -1241,7 +1378,9 @@ sub submission {
 	return;
     }
 
-    $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'});
+    if (!$ENV{'form.lastSub'}) { $ENV{'form.lastSub'} = 'datesub'; }
+    if (!$ENV{'form.vProb'}) { $ENV{'form.vProb'} = 'yes'; }
+    if (!$ENV{'form.vAns'}) { $ENV{'form.vAns'} = 'yes'; }
     my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
     my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
@@ -1264,8 +1403,16 @@ sub submission {
 
 	# option to display problem, only once else it cause problems 
         # with the form later since the problem has a form.
-	if ($ENV{'form.vProb'} eq 'yes' or !$ENV{'form.vProb'}) {
-	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1));
+	if ($ENV{'form.vProb'} eq 'yes' or $ENV{'form.vAns'} eq 'yes') {
+	    my $mode;
+	    if ($ENV{'form.vProb'} eq 'yes' && $ENV{'form.vAns'} eq 'yes') {
+		$mode='both';
+	    } elsif ($ENV{'form.vProb'} eq 'yes') {
+		$mode='text';
+	    } elsif ($ENV{'form.vAns'} eq 'yes') {
+		$mode='answer';
+	    }
+	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
 	}
 	
 	# kwclr is the only variable that is guaranteed to be non blank 
@@ -1300,6 +1447,7 @@ sub submission {
 			'<input type="hidden" name="url"        value="'.$url.'" />'."\n".
 			'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" />'."\n".
 			'<input type="hidden" name="vProb"      value="'.$ENV{'form.vProb'}.'" />'."\n".
+			'<input type="hidden" name="vAns"       value="'.$ENV{'form.vAns'}.'" />'."\n".
 			'<input type="hidden" name="lastSub"    value="'.$ENV{'form.lastSub'}.'" />'."\n".
 			'<input type="hidden" name="section"    value="'.$ENV{'form.section'}.'">'."\n".
 			'<input type="hidden" name="submitonly" value="'.$ENV{'form.submitonly'}.'">'."\n".
@@ -1314,6 +1462,9 @@ sub submission {
 			    '<input type="hidden" name="msgsub"   value="'.$ENV{'form.msgsub'}.'" />'."\n".
 			    '<input type="hidden" name="shownSub" value="0" />'."\n".
 			    '<input type="hidden" name="savemsgN" value="'.$ENV{'form.savemsgN'}.'" />'."\n");
+	    foreach my $partid (&Apache::loncommon::get_env_multiple('form.vPart')) {
+		$request->print('<input type="hidden" name="vPart" value="'.$partid.'" />'."\n");
+	    }
 	}
 	
 	my ($cts,$prnmsg) = (1,'');
@@ -1350,13 +1501,22 @@ KEYWORDS
         }
     }
 
-    if ($ENV{'form.vProb'} eq 'all') {
+    if ($ENV{'form.vProb'} eq 'all' or $ENV{'form.vAns'} eq 'all') {
 	$request->print('<br /><br /><br />') if ($counter > 0);
-	$request->print(&show_problem($request,$symb,$uname,$udom,1,1));
+	my $mode;
+	if ($ENV{'form.vProb'} eq 'all' && $ENV{'form.vAns'} eq 'all') {
+	    $mode='both';
+	} elsif ($ENV{'form.vProb'} eq 'all' ) {
+	    $mode='text';
+	} elsif ($ENV{'form.vAns'} eq 'all') {
+	    $mode='answer';
+	}
+	$request->print(&show_problem($request,$symb,$uname,$udom,1,1,$mode));
     }
+
     my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
 
-    my ($partlist,$handgrade) = &response_type($url,$symb);
+    my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
 
     # Display student info
     $request->print(($counter == 0 ? '' : '<br />'));
@@ -1403,8 +1563,10 @@ KEYWORDS
 		    $result.=$$fullname{$_}.'&nbsp; &nbsp; &nbsp;';
 		}
                 $result.='<br />'."\n";
+		my ($part)=split(/\./,$_);
 		$result.='<input type="hidden" name="collaborator'.$counter.
-		    '" value="'.(join ':',@goodcollaborators).'" />'."\n";
+		    '" value="'.$part.':'.(join ':',@goodcollaborators).'" />'.
+		    "\n";
 	    }
 	    if (scalar(@badcollaborators) > 0) {
 		$result.='<table border="0"><tr bgcolor="#ffbbbb"><td>';
@@ -1430,71 +1592,78 @@ KEYWORDS
     #             (3) Last submission plus the parts info
     #             (4) The whole record for this student
     if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
-	if ($ENV{'form.'.$uname.':'.$udom.':submitted_by'}) {
-	    my $submitby=''.
-		'<b>Collaborative submission by: </b>'.
-		'<a href="javascript:viewSubmitter(\''.
-		$ENV{'form.'.$uname.':'.$udom.':submitted_by'}.
-		'\')"; TARGET=_self>'.
-		$$fullname{$ENV{'form.'.$uname.':'.$udom.':submitted_by'}}.'</a>';
-	    $request->print($submitby);
-	} else {
-	    my ($string,$timestamp)= &get_last_submission (\%record);
-	    my $lastsubonly=''.
-		($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
-		 $$timestamp)."</td></tr>\n";
-	    if ($$timestamp eq '') {
-		$lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
-	    } else {
-		for my $part (sort keys(%$handgrade)) {
-		    my ($responsetype,$foo) = split(/:/,$$handgrade{$part});
-		    my ($partid,$respid) = split(/_/,$part);
-		    if (!exists($record{'resource.'.$partid.'.'.$respid.'.submission'})) {
+	my ($string,$timestamp)= &get_last_submission(\%record);
+	my $lastsubonly=''.
+	    ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
+	     $$timestamp)."</td></tr>\n";
+	if ($$timestamp eq '') {
+	    $lastsubonly.='<tr><td bgcolor="#ffffe6">'.$$string[0]; 
+	} else {
+	    my %seenparts;
+	    for my $part (sort keys(%$handgrade)) {
+		my ($partid,$respid) = split(/_/,$part);
+		if ($ENV{"form.$uname:$udom:$partid:submitted_by"}) {
+		    if (exists($seenparts{$partid})) { next; }
+		    $seenparts{$partid}=1;
+		    my $submitby='<b>Part '.$partid.
+			' Collaborative submission by: </b>'.
+			'<a href="javascript:viewSubmitter(\''.
+			$ENV{"form.$uname:$udom:$partid:submitted_by"}.
+			'\')"; TARGET=_self>'.
+			$$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
+		    $request->print($submitby);
+		    next;
+		}
+		my $responsetype = $responseType->{$partid}->{$respid};
+		if (!exists($record{"resource.$partid.$respid.submission"})) {
+		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
+			$partid.'</b> <font color="#999999">( ID '.$respid.
+			' )</font>&nbsp; &nbsp;'.
+			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
+		    next;
+		}
+		foreach (@$string) {
+		    my ($partid,$respid) = /^resource\.([^\.]*)\.([^\.]*)\.submission/;
+		    if ($part ne ($partid.'_'.$respid)) { next; }
+		    my ($ressub,$subval) = split(/:/,$_,2);
+		    # Similarity check
+		    my $similar='';
+		    if($ENV{'form.checkPlag'}){
+			my ($oname,$odom,$ocrsid,$oessay,$osim)=
+			    &most_similar($uname,$udom,$subval);
+			if ($osim) {
+			    $osim=int($osim*100.0);
+			    $similar="<hr /><h3><font color=\"#FF0000\">Essay".
+				" is $osim% similar to an essay by ".
+				&Apache::loncommon::plainname($oname,$odom).
+				'</font></h3><blockquote><i>'.
+				&keywords_highlight($oessay).
+				'</i></blockquote><hr />';
+			}
+		    }
+		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
+		    if ($ENV{'form.lastSub'} eq 'lastonly' || 
+			($ENV{'form.lastSub'} eq 'hdgrade' && 
+			 $$handgrade{$part} eq 'yes')) {
 			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
 			    $partid.'</b> <font color="#999999">( ID '.$respid.
-			    ' )</font>&nbsp; &nbsp;'.
-			    '<font color="red">Nothing submitted - no attempts</font><br /><br />';
- 		    } else {
-			foreach (@$string) {
-			    my ($partid,$respid) = /^resource\.(\w+)\.(\w+)\.submission/;
-			    if ($part eq ($partid.'_'.$respid)) {
-				my ($ressub,$subval) = split(/:/,$_,2);
-                            # Similarity check
-				my $similar='';
-				my ($oname,$odom,$ocrsid,$oessay,$osim)=&most_similar($uname,$udom,$subval);
-				if ($osim) {
-				    $osim=int($osim*100.0);
-				    $similar='<hr /><h3><font color="#FF0000">Essay is '.$osim.
-					'% similar to an essay by '.&Apache::loncommon::plainname($oname,$odom).
-					'</font></h3><blockquote><i>'.
-					&keywords_highlight($oessay).'</i></blockquote><hr />';
-				}
-				$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part '.
-				    $partid.'</b> <font color="#999999">( ID '.$respid.
-				    ' )</font>&nbsp; &nbsp;'.
-				    ($record{"resource.$partid.$respid.uploadedurl"}?
-				     '<a href="'.
-				     &Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).
-				     '"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> '.
-				     '<font color="red" size="1">Like all files provided by users, '.
-				     'this file may contain virusses</font><br />':'').
-				     '<b>Submitted Answer: </b>'.
-				     &cleanRecord($subval,$responsetype,$symb).
-				      '<br /><br />'.$similar."\n"
-				     if ($ENV{'form.lastSub'} eq 'lastonly' || 
-					 ($ENV{'form.lastSub'} eq 'hdgrade' && 
-					  $$handgrade{$part} =~ /:yes$/));
-			    }
+			    ' )</font>&nbsp; &nbsp;';
+			if ($record{"resource.$partid.$respid.uploadedurl"}) {
+			    $lastsubonly.='<a href="'.&Apache::lonnet::tokenwrapper($record{"resource.$partid.$respid.uploadedurl"}).'" target="lonGRDs"><img src="/adm/lonIcons/unknown.gif" border=0"> File uploaded by student</a> <font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
 			}
+			$lastsubonly.='<b>Submitted Answer: </b>'.
+			    &cleanRecord($subval,$responsetype,$symb,$partid,
+					 $respid,\%record,$order);
+			if ($similar) {$lastsubonly.="<br /><br />$similar\n";}
 		    }
 		}
 	    }
-	    $lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
-	    $request->print($lastsubonly);
 	}
+	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
+	$request->print($lastsubonly);
     } elsif ($ENV{'form.lastSub'} eq 'datesub') {
 	my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
-	$request->print(&displaySubByDates(\$symb,\%record,$parts,$responseType,$checkIcon));
+	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
     } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
 								 $ENV{'request.course.id'},
@@ -1510,10 +1679,11 @@ KEYWORDS
 	my $toGrade.='<input type="button" value="Grade Student" '.
 	    'onClick="javascript:checksubmit(this.form,\'Grade Student\',\''
 	    .$counter.'\');" TARGET=_self> &nbsp;'."\n" if (&canmodify($usec));
-	$toGrade.='</td></tr></table></td></tr></table></form>'."\n";
-	$toGrade.=&show_grading_menu_form($symb,$url) 
-	    if (($ENV{'form.command'} eq 'submission') || 
-		($ENV{'form.command'} eq 'processGroup' && $counter == $total));
+	$toGrade.='</td></tr></table></td></tr></table>'."\n";
+	if (($ENV{'form.command'} eq 'submission') || 
+	    ($ENV{'form.command'} eq 'processGroup' && $counter == $total)) {
+	    $toGrade.='</form>'.&show_grading_menu_form($symb,$url) 
+	}
 	$request = print($toGrade);
 	return;
     }
@@ -1667,18 +1837,21 @@ sub processHandGrade {
 							       $ENV{'form.msgsub'},$message);
 	    }
 	    if ($ENV{'form.collaborator'.$ctr}) {
-		my (@collaborators) = split(/:/,$ENV{'form.collaborator'.$ctr});
-		foreach (@collaborators) {
-		    my ($errorflag,$pts,$wgt) = 
-			&saveHandGrade($request,$url,$symb,$_,$udom,$ctr,$ENV{'form.unamedom'.$ctr});
-		    if ($errorflag eq 'not_allowed') {
-			$request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
-			next;
-		    } else {
-			if ($message ne '') {
-			    $msgstatus = &Apache::lonmsg::user_normal_msg ($_,$udom,
-									   $ENV{'form.msgsub'},
-									   $message);
+		my @collabstrs=&Apache::loncommon::get_env_multiple("form.collaborator$ctr");
+		foreach my $collabstr (@collabstrs) {
+		    my ($part,@collaborators) = split(/:/,$collabstr);
+		    foreach (@collaborators) {
+			my ($errorflag,$pts,$wgt) = 
+			    &saveHandGrade($request,$url,$symb,$_,$udom,$ctr,
+					   $ENV{'form.unamedom'.$ctr},$part);
+			if ($errorflag eq 'not_allowed') {
+			    $request->print("<font color=\"red\">Not allowed to modify grades for $_:$udom</font>");
+			    next;
+			} else {
+			    if ($message ne '') {
+				$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$ENV{'form.msgsub'},$message);
+			    }
+			    
 			}
 		    }
 		}
@@ -1782,15 +1955,28 @@ sub processHandGrade {
     }
     $ctr = 0;
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
+    my ($partlist) = &response_type($url);
     foreach my $student (@parsedlist) {
+	my $submitonly=$ENV{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
-	if ($ENV{'form.submitonly'} eq 'yes') {
-	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
-	    my $statusflg = '';
-	    foreach (split(/:/,$ENV{'form.gradePartRespid'})){
-		$statusflg = 1 if (exists ($record{'resource.'.$_.'.submission'}));
+	if ($submitonly =~ /^(yes|graded|incorrect)$/) {
+#	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+	    my %status=&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
+	    my $submitted = 0;
+	    my $graded = 1;
+	    foreach (keys(%status)) {
+		$submitted = 1 if ($status{$_} ne 'nothing');
+		$graded = 0 if ($status{$_} =~ /^correct/);
+		my ($foo,$partid,$foo1) = split(/\./,$_);
+		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
+		    $submitted = 0;
+		}
 	    }
-	    next if ($statusflg eq '');
+	    next if (!$submitted && ($submitonly eq 'yes' ||
+				     $submitonly eq 'incorrect' ||
+				     $submitonly eq 'graded'));
+	    next if (!$graded && ($submitonly eq 'graded' ||
+				  $submitonly eq 'incorrect'));
 	}
 	push @nextlist,$student if ($ctr < $ntstu);
 	last if ($ctr == $ntstu);
@@ -1820,7 +2006,7 @@ sub processHandGrade {
 
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
-    my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter) = @_;
+    my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
 					   $ENV{'request.course.id'});
     if (!&canmodify($usec)) { return('not_allowed'); }
@@ -1828,6 +2014,8 @@ sub saveHandGrade {
     my %newrecord  = ();
     my ($pts,$wgt) = ('','');
     foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
+	#collaborator may vary for different parts
+	if ($submitter && $_ ne $part) { next; }
 	my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
 	if ($dropMenu eq 'excused') {
 	    if ($record{'resource.'.$_.'.solved'} ne 'excused') {
@@ -1848,27 +2036,37 @@ sub saveHandGrade {
 	    $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? 
 		    $ENV{'form.GD_BOX'.$newflg.'_'.$_} : 
 		    $ENV{'form.RADVAL'.$newflg.'_'.$_});
-	    return 'no_score' if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '');
+	    if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '') {
+		next;
+	    }
 	    $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : 
 		$ENV{'form.WGT'.$newflg.'_'.$_};
 	    my $partial= $pts/$wgt;
-	    next if ($partial eq $record{'resource.'.$_.'.awarded'}); #do not update score for part if not changed.
-	    $newrecord{'resource.'.$_.'.awarded'}  = $partial 
-		if ($record{'resource.'.$_.'.awarded'} ne $partial);
+	    if ($partial eq $record{'resource.'.$_.'.awarded'}) {
+		#do not update score for part if not changed.
+		next;
+	    }
+	    if ($record{'resource.'.$_.'.awarded'} ne $partial) {
+		$newrecord{'resource.'.$_.'.awarded'}  = $partial;
+	    }
 	    my $reckey = 'resource.'.$_.'.solved';
 	    if ($partial == 0) {
-		$newrecord{$reckey} = 'incorrect_by_override' 
-		    if ($record{$reckey} ne 'incorrect_by_override');
+		if ($record{$reckey} ne 'incorrect_by_override') {
+		    $newrecord{$reckey} = 'incorrect_by_override';
+		}
 	    } else {
-		$newrecord{$reckey} = 'correct_by_override' 
-		    if ($record{$reckey} ne 'correct_by_override');
+		if ($record{$reckey} ne 'correct_by_override') {
+		    $newrecord{$reckey} = 'correct_by_override';
+		}
+	    }	    
+	    if ($submitter && 
+		($record{'resource.'.$_.'.submitted_by'} ne $submitter)) {
+		$newrecord{'resource.'.$_.'.submitted_by'} = $submitter;
 	    }
-	    $newrecord{'resource.'.$_.'.submitted_by'} = $submitter 
-		if ($submitter && ($record{'resource.'.$_.'.submitted_by'} ne $submitter));
-	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+	    $newrecord{'resource.'.$_.'.regrader'}=
+		"$ENV{'user.name'}:$ENV{'user.domain'}";
 	}
     }
-
     if (scalar(keys(%newrecord)) > 0) {
 	&Apache::lonnet::cstore(\%newrecord,$symb,
 				$ENV{'request.course.id'},$domain,$stuname);
@@ -2051,8 +2249,14 @@ sub viewgrades {
     &viewgrades_js($request);
 
     my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); 
-    my $result='<h3><font color="#339933">Manual Grading</font></h3>';
+    #need to make sure we have the correct data for later EXT calls, 
+    #thus invalidate the cache
+    &Apache::lonnet::devalidatecourseresdata(
+                 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
+    &Apache::lonnet::clear_EXT_cache_status();
 
+    my $result='<h3><font color="#339933">'.&mt('Manual Grading').'</font></h3>';
     $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
 
     #view individual student submission form - called using Javascript viewOneStudent
@@ -2090,7 +2294,7 @@ sub viewgrades {
 	my ($partid,$respid) = split (/_/,$_,2);
 	next if $seen{$partid};
 	$seen{$partid}++;
-	my ($responsetype,$handgrade)=split(/:/,$$handgrade{$_});
+	my $handgrade=$$handgrade{$_};
 	my $wgt = &Apache::lonnet::EXT('resource.'.$partid.'.weight',$symb);
 	$weight{$partid} = $wgt eq '' ? '1' : $wgt;
 
@@ -2132,7 +2336,7 @@ sub viewgrades {
     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
 	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
 	'<td>'.&nameUserString('header')."</td>\n";
-    my (@parts) = sort(&getpartlist($url));
+    my (@parts) = sort(&getpartlist($url,$symb));
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
 	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
@@ -2249,7 +2453,7 @@ sub editgrades {
     my %columns = ();
     my ($i,$ctr,$count,$rec_update) = (0,0,0,0);
 
-    my (@parts) = sort(&getpartlist($url));
+    my (@parts) = sort(&getpartlist($url,$symb));
     my $header;
     while ($ctr < $ENV{'form.totalparts'}) {
 	my $partid = $ENV{'form.partid_'.$ctr};
@@ -2327,18 +2531,17 @@ sub editgrades {
 		$newrecord{'resource.'.$_.'.awarded'} = 0;
 		$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
 		$updateflag = 1;
+	    } elsif (!($old_part eq $partial && $old_score eq $score)) {
+		$updateflag = 1;
+		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
+		$newrecord{'resource.'.$_.'.solved'}   = $score;
+		$rec_update++;
 	    }
 
 	    $line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
 		'<td align="center">'.$awarded.
 		($score eq 'excused' ? $score : '').'&nbsp;</td>';
 
-	    if (!($old_part eq $partial && $old_score eq $score)) {
-		$updateflag = 1;
-		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
-		$newrecord{'resource.'.$_.'.solved'}   = $score;
-		$rec_update++;
-	    }
 
 	    my $partid=$_;
 	    foreach my $stores (@parts) {
@@ -2515,8 +2718,8 @@ ENDPICK
 }
 
 sub csvupload_fields {
-    my ($url) = @_;
-    my (@parts) = &getpartlist($url);
+    my ($url,$symb) = @_;
+    my (@parts) = &getpartlist($url,$symb);
     my @fields=(['username','Student Username'],['domain','Student Domain']);
     foreach my $part (sort(@parts)) {
 	my @datum;
@@ -2599,7 +2802,7 @@ sub csvuploadmap {
     &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
-	my @fields=&csvupload_fields($url);
+	my @fields=&csvupload_fields($url,$symb);
 
 	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($request,\@records);
@@ -2649,7 +2852,9 @@ sub csvuploadassign {
     foreach my $grade (@gradedata) {
 	my %entries=&Apache::loncommon::record_sep($grade);
 	my $username=$entries{$fields{'username'}};
+	$username=~s/\s//g;
 	my $domain=$entries{$fields{'domain'}};
+	$domain=~s/\s//g;
 	if (!exists($$classlist{"$username:$domain"})) {
 	    push(@skipped,"$username:$domain");
 	    next;
@@ -2726,7 +2931,9 @@ LISTJAVASCRIPT
     $result.='<form action="/adm/grades" method="post" name="displayPage">'."\n";
     $result.='&nbsp;<b>Problems from:</b> <select name="selectpage">'."\n";
     my ($titles,$symbx) = &getSymbMap($request);
-    my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/); 
+    my ($curpage) =&Apache::lonnet::decode_symb($symb); 
+#    my ($curpage,$mapId) =&Apache::lonnet::decode_symb($symb); 
+#    my $type=($curpage =~ /\.(page|sequence)/);
     my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -2746,7 +2953,7 @@ LISTJAVASCRIPT
     $result.='<input type="hidden" name="page" />'."\n".
 	'<input type="hidden" name="title" />'."\n";
 
-    $result.='&nbsp;<b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked /> no '."\n".
+    $result.='&nbsp;<b>View Problems Text: </b><input type="radio" name="vProb" value="no" checked="on" /> no '."\n".
 	'<input type="radio" name="vProb" value="yes" /> yes '."<br>\n";
 
     $result.='&nbsp;<b>Submission Details: </b>'.
@@ -2798,9 +3005,7 @@ LISTJAVASCRIPT
 
 sub getSymbMap {
     my ($request) = @_;
-    my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
-						  $ENV{'request.course.fn'}.'_parms.db');
-#    $navmap->init();
+    my $navmap = Apache::lonnavmaps::navmap->new();
 
     my %symbx = ();
     my @titles = ();
@@ -2834,6 +3039,14 @@ sub displayPage {
     my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
     my ($uname,$udom) = split(/:/,$ENV{'form.student'});
     my $usec=$classlist->{$ENV{'form.student'}}[5];
+
+    #need to make sure we have the correct data for later EXT calls, 
+    #thus invalidate the cache
+    &Apache::lonnet::devalidatecourseresdata(
+                 $ENV{'course.'.$ENV{'request.course.id'}.'.num'},
+                 $ENV{'course.'.$ENV{'request.course.id'}.'.domain'});
+    &Apache::lonnet::clear_EXT_cache_status();
+
     if (!&canview($usec)) {
 	$request->print('<font color="red">Unable to view requested student.('.$ENV{'form.student'}.')</font>');
 	$request->print(&show_grading_menu_form($symb,$url));
@@ -2845,9 +3058,8 @@ sub displayPage {
     &sub_page_js($request);
     $request->print($result);
 
-    my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
-						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
-    my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
     my $iterator = $navmap->getIterator($map->map_start(),
@@ -2888,8 +3100,9 @@ sub displayPage {
 	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
 		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
 	    $studentTable.='<td valign="top">';
-	    if ($ENV{'form.vProb'} eq 'yes') {
-		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1);
+	    if ($ENV{'form.vProb'} eq 'yes' ) {
+		$studentTable.=&show_problem($request,$symbx,$uname,$udom,1,
+					     undef,'both');
 	    } else {
 		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$ENV{'request.course.id'});
 		$companswer =~ s|<form(.*?)>||g;
@@ -2910,9 +3123,16 @@ sub displayPage {
 		} else {
 		    my %responseType = ();
 		    foreach my $partid (@{$parts}) {
-			$responseType{$partid} = $curRes->responseType($partid);
+			my @responseIds =$curRes->responseIds($partid);
+			my @responseType =$curRes->responseType($partid);
+			my %responseIds;
+			for (my $i=0;$i<=$#responseIds;$i++) {
+			    $responseIds{$responseIds[$i]}=$responseType[$i];
+			}
+			$responseType{$partid} = \%responseIds;
 		    }
-		    $studentTable.= &displaySubByDates(\$symbx,\%record,$parts,\%responseType,$checkIcon);
+		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
+
 		}
 	    } elsif ($ENV{'form.lastSub'} eq 'all') {
 		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
@@ -2947,7 +3167,7 @@ sub displayPage {
 }
 
 sub displaySubByDates {
-    my ($symbx,$record,$parts,$responseType,$checkIcon) = @_;
+    my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
     my $studentTable='<table border="0" width="100%"><tr><td bgcolor="#777777">'.
 	'<table border="0" width="100%"><tr bgcolor="#e6ffff">'.
 	'<td><b>Date/Time</b></td>'.
@@ -2955,33 +3175,62 @@ sub displaySubByDates {
 	'<td><b>Status&nbsp;</b></td></tr>';
     my ($version);
     my %mark;
+    my %orders;
     $mark{'correct_by_student'} = $checkIcon;
-    return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />' 
-	if (!exists($$record{'1:timestamp'}));
+    if (!exists($$record{'1:timestamp'})) {
+	return '<br />&nbsp;<font color="red">Nothing submitted - no attempts</font><br />';
+    }
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
 	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
-	    my @matchKey = grep /^resource\.$partid\..*?\.submission$/,@versionKeys;
+	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
-	    $displaySub[0].=(exists $$record{$version.':'.$matchKey[0]}) ? 
-		'<b>Part&nbsp;'.$partid.'&nbsp;'.
-		($$record{"$version:resource.$partid.tries"} eq '' ? 'Trial&nbsp;not&nbsp;counted' :
-		 'Trial&nbsp;'.$$record{"$version:resource.$partid.tries"}).'</b>&nbsp; '.
-		 &cleanRecord($$record{$version.':'.$matchKey[0]},$$responseType{$partid},$$symbx).'<br />' : '';
-	    $displaySub[1].=(exists $$record{"$version:resource.$partid.award"}) ?
-		'<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
-		lc($$record{"$version:resource.$partid.award"}).' '.
-		$mark{$$record{"$version:resource.$partid.solved"}}.'<br />' : '';
-	    $displaySub[2].=(exists $$record{"$version:resource.$partid.regrader"}) ?
-		$$record{"$version:resource.$partid.regrader"}.' (<b>Part:</b> '.$partid.')' : '';
-	}
-	$displaySub[2].=(exists $$record{"$version:resource.regrader"}) ?
-	    $$record{"$version:resource.regrader"} : ''; # needed because old essay regrader has not parts info
-	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1].
-	    ($displaySub[2] eq '' ? '' : 'Manually graded by '.$displaySub[2]).'&nbsp;</td></tr>';
+	    foreach my $matchKey (@matchKey) {
+		if (exists $$record{$version.':'.$matchKey}) {
+		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
+		    $displaySub[0].='<b>Part&nbsp;'.$partid.'&nbsp;';
+		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
+			$responseId.')</font>&nbsp;';
+		    if ($$record{"$version:resource.$partid.tries"} eq '') {
+			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
+		    } else {
+			$displaySub[0].='Trial&nbsp;'.
+			    $$record{"$version:resource.$partid.tries"};
+		    }
+		    my $responseType=$responseType->{$partid}->{$responseId};
+		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
+		    if (!exists($orders{$partid}->{$responseId})) {
+			$orders{$partid}->{$responseId}=
+			    &get_order($partid,$responseId,$symb,$uname,$udom);
+		    }
+		    $displaySub[0].='</b>&nbsp; '.
+			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:").'<br />';
+		}
+	    }
+	    if (exists $$record{"$version:resource.$partid.award"}) {
+		$displaySub[1].='<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
+		    lc($$record{"$version:resource.$partid.award"}).' '.
+		    $mark{$$record{"$version:resource.$partid.solved"}}.
+		    '<br />';
+	    }
+	    if (exists $$record{"$version:resource.$partid.regrader"}) {
+		$displaySub[2].=$$record{"$version:resource.$partid.regrader"}.
+		    ' (<b>'.&mt('Part').':</b> '.$partid.')';
+	    }
+	}
+	# needed because old essay regrader has not parts info
+	if (exists $$record{"$version:resource.regrader"}) {
+	    $displaySub[2].=$$record{"$version:resource.regrader"};
+	}
+	$studentTable.='<td>'.$displaySub[0].'&nbsp;</td><td>'.$displaySub[1];
+	if ($displaySub[2]) {
+	    $studentTable.='Manually graded by '.$displaySub[2];
+	}
+	$studentTable.='&nbsp;</td></tr>';
+    
     }
     $studentTable.='</table></td></tr></table>';
     return $studentTable;
@@ -3008,9 +3257,8 @@ sub updateGradeByPage {
 
     $request->print($result);
 
-    my $navmap = Apache::lonnavmaps::navmap-> new($ENV{'request.course.fn'}.'.db',
-						  $ENV{'request.course.fn'}.'_parms.db',1, 1);
-    my ($mapUrl, $id, $resUrl) = split(/___/, $ENV{'form.page'});
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});
     my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
 
     my $iterator = $navmap->getIterator($map->map_start(),
@@ -3132,7 +3380,7 @@ sub getSequenceDropDown {
     my ($request,$symb)=@_;
     my $result='<select name="selectpage">'."\n";
     my ($titles,$symbx) = &getSymbMap($request);
-    my ($curpage,$type,$mapId) = ($symb =~ /(.*?\.(page|sequence))___(\d+)___/); 
+    my ($curpage)=&Apache::lonnet::decode_symb($symb); 
     my $ctr=0;
     foreach (@$titles) {
 	my ($minder,$showtitle) = ($_ =~ /(\d+)\.(.*)/);
@@ -3146,17 +3394,18 @@ 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'});
-    my @files=sort(readdir(DIR));
+    my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
+    my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+    my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
+				    &Apache::loncommon::propath($cdom,$cname));
     foreach my $filename (@files) {
-	if ($filename eq '.' or $filename eq '..') { next; }
+	($filename)=split(/&/,$filename);
+	if ($filename!~/^scantron_orig_/) { next ; }
+	$filename=~s/^scantron_orig_//;
 	$result.="<option>$filename</option>\n";
     }
-    closedir(DIR);
     $result.="</select>";
     return $result;
 }
@@ -3187,12 +3436,12 @@ sub scantron_selectphase {
     #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_validate" />
-  $default_form_data
-  <table width="100%" border="0">
+    <table width="100%" border="0">
     <tr>
       <td bgcolor="#777777">
+       <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantro_process">
+       <input type="hidden" name="command" value="scantron_validate" />
+        $default_form_data
         <table width="100%" border="0">
           <tr bgcolor="#e6ffff">
             <td>
@@ -3214,16 +3463,59 @@ 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>
+          <tr bgcolor="#ffffe6">
+            <td>
+              <input type="submit" value="Validate Scantron Records" />
+            </td>
+          </tr>
+        </table>
+       </form>
+      </td>
+    </tr>
+SCANTRONFORM
+   
+    $r->print($result);
+
+    if (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'}) ||
+        &Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
+
+        $r->print(<<SCANTRONFORM);
+    <tr>
+      <td bgcolor="#777777">
+        <table width="100%" border="0">
+          <tr bgcolor="#e6ffff">
+            <td>
+              Specify a Scantron data file to upload.
+            </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td>
+SCANTRONFORM
+        &scantron_upload_scantron_data($r);
+
+        $r->print(<<SCANTRONFORM);
+            </td>
+          </tr>
         </table>
       </td>
     </tr>
+SCANTRONFORM
+    }
+
+    $r->print(<<SCANTRONFORM);
   </table>
-  <input type="submit" value="Validate Scantron Records" />
 </form>
 $grading_menu_button
 SCANTRONFORM
 
-    return $result;
+    return
 }
 
 sub get_scantron_config {
@@ -3269,23 +3561,52 @@ sub username_to_idmap {
 }
 
 sub scantron_fixup_scanline {
-    my ($scantron_config,$line,$field,$newvalue) = @_;
+    my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
     if ($field eq 'ID') {
-	if ($newvalue > $$scantron_config{'IDlength'}) {
+	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
 	    return ($line,1,'New value to large');
 	}
-	if ($newvalue < $$scantron_config{'IDlength'}) {
-	    $newvalue=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
-			      $newvalue);
+	if (length($args->{'newid'}) < $$scantron_config{'IDlength'}) {
+	    $args->{'newid'}=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
+				     $args->{'newid'});
 	}
 	substr($line,$$scantron_config{'IDstart'}-1,
-	       $$scantron_config{'IDlength'})=$newvalue;
+	       $$scantron_config{'IDlength'})=$args->{'newid'};
+	if ($args->{'newid'}=~/^\s*$/) {
+	    &scan_data($scan_data,"$whichline.user",
+		       $args->{'username'}.':'.$args->{'domain'});
+	}
+    } 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 ($args->{'response'} eq 'none') {
+	    &scan_data($scan_data,
+		       "$whichline.no_bubble.".$args->{'question'},'1');
+	} else {
+	    substr($answer,$args->{'response'},1)=$on;
+	    &scan_data($scan_data,
+		       "$whichline.no_bubble.".$args->{'question'},undef,'1');
+	}
+	my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+	substr($line,$where-1,$length)=$answer;
     }
     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,$whichline,$scantron_config,$scan_data)=@_;
     my %record;
     my $questions=substr($line,$$scantron_config{'Qstart'}-1);
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
@@ -3315,21 +3636,25 @@ 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);
+	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,"$whichline.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'}},$currentquest);
-	    my @ans=@array;
-	    my $i=length($ans[0]);shift(@ans);
-	    while (@ans) {
-		$i+=length($ans[0])+1;
-		$record{"scantron.$questnum.answer"}.=$alphabet[$i];
-	    }
-	}
+ 	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;
@@ -3337,7 +3662,6 @@ sub scantron_parse_scanline {
 
 sub scantron_add_delay {
     my ($delayqueue,$scanline,$errormessage,$errorcode)=@_;
-    Apache->request->print('add_delay_error '.$_[2] );
     push(@$delayqueue,
 	 {'line' => $scanline, 'emsg' => $errormessage,
 	  'ecode' => $errorcode }
@@ -3345,14 +3669,15 @@ sub scantron_add_delay {
 }
 
 sub scantron_find_student {
-    my ($scantron_record,$idmap)=@_;
+    my ($scantron_record,$scan_data,$idmap,$line)=@_;
     my $scanID=$$scantron_record{'scantron.ID'};
+    if ($scanID =~ /^\s*$/) {
+ 	return &scan_data($scan_data,"$line.user");
+    }
     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};
-	}
+ 	if (lc($id) eq lc($scanID)) {
+ 	    return $$idmap{$id};
+ 	}
     }
     return undef;
 }
@@ -3365,41 +3690,44 @@ 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) = @_;
-    if ($ENV{'form.scantron_corrections'} =~ /^(duplicate|incorrect)ID$/) {
-	my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
-	my $scanlines=&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;
-	} else {
-	    my $newstudent=$ENV{'form.scantron_username'}.':'.
-		$ENV{'form.scantron_domain'};
-	    my $newid=$classlist->{$newstudent}->[&Apache::loncoursedata::CL_ID];
+    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,$which,
+				     'ID',{'newid'=>$newid,
+				    'username'=>$ENV{'form.scantron_username'},
+				    'domain'=>$ENV{'form.scantron_domain'}});
+    } elsif ($ENV{'form.scantron_corrections'} =~ /^(missing|double)bubble$/) {
+	foreach my $question (split(',',$ENV{'form.scantron_questions'})) {
 	    ($line,$err,$errmsg)=
-		&scantron_fixup_scanline(\%scantron_config,$line,'ID',$newid);
-	}
-	if ($err) {
-	    $r->print("Unable to accept last correction, an error occurred :$errmsg:");
-	} else {
-	    &scantron_put_line($scanlines,$which,$line,$skip);
-	    &scantron_putfile($scanlines);
+		&scantron_fixup_scanline(\%scantron_config,$scan_data,$line,
+					 $which,'answer',
+					 { 'question'=>$question,
+		       'response'=>$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);
@@ -3413,10 +3741,10 @@ sub scantron_validate_file {
     $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);
@@ -3436,52 +3764,64 @@ SCANTRONFORM
     }
     my $stop=0;
     while (!$stop && $currentphase < scalar(@validate_phases)) {
+	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
+	$r->rflush();
 	my $which="scantron_validate_".$validate_phases[$currentphase];
 	{
 	    no strict 'refs';
 	    ($stop,$currentphase)=&$which($r,$currentphase);
 	}
     }
-    $r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+    if (!$stop) {
+	$r->print("Validation process complete.<br />");
+	$r->print('<input type="submit" name="submit" value="Start Grading" />');
+	$r->print('<input type="hidden" name="command" value="scantron_process" />');
+    } else {
+	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
+	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
+    }
+    if ($stop) {
+	$r->print('<input type="submit" name="submit" value="Continue ->" />');
+	$r->print(' using corrected info <br />');
+	$r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
+	$r->print(" this scanline saving it for later.");
+    }
+    $r->print(" </form><br />".&show_grading_menu_form($symb,$url).
+	      "</body></html>");
     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/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.
+    $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)];
+    $scanlines{'orig'}=[(split("\n",$lines,-1))];
     my $temp=$scanlines{'orig'};
     $scanlines{'count'}=$#$temp;
 
-    $lines=&Apache::lonnet::getfile('/uploaded/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.
+    $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)];
+	$scanlines{'corrected'}=[(split("\n",$lines,-1))];
     }
-    $lines=&Apache::lonnet::getfile('/uploaded/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-		   $ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.
+    $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)];
+	$scanlines{'skipped'}=[(split("\n",$lines,-1))];
     }
-    return \%scanlines;
+    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 {
@@ -3495,13 +3835,11 @@ sub lonnet_putfile {
 }
 
 sub scantron_putfile {
-    my ($scanlines) = @_;
+    my ($scanlines,$scan_data) = @_;
     #FIXME really would prefer a scantron directory but tokenwrapper
     # doesn't allow access to subdirs of userfiles
-    my $prefix='/uploaded/'.
-	$ENV{'course.'.$ENV{'request.course.id'}.'.domain'}.'/'.
-	$ENV{'course.'.$ENV{'request.course.id'}.'.num'}.'/'.
-	'scantron_';
+    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_'.
@@ -3512,6 +3850,7 @@ sub scantron_putfile {
     &lonnet_putfile(join("\n",@{$scanlines->{'skipped'}}),
 		    $prefix.'skipped_'.
 		    $ENV{'form.scantron_selectfile'});
+    &Apache::lonnet::put('scantrondata',$scan_data,$cdom,$cname);
 }
 
 sub scantron_get_line {
@@ -3523,7 +3862,10 @@ sub scantron_get_line {
 
 sub scantron_put_line {
     my ($scanlines,$i,$newline,$skip)=@_;
-    if ($skip) { $scanlines->{'skipped'}[$i]=$newline;return; }
+    if ($skip) {
+	$scanlines->{'skipped'}[$i]=$newline;
+	return;
+    }
     $scanlines->{'corrected'}[$i]=$newline;
 }
 
@@ -3536,38 +3878,53 @@ sub scantron_validate_ID {
 
     #get scantron line setup
     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
-    my $scanlines=&scantron_getfile();
+    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);
+	if ($line=~/^[\s\cz]*$/) { next; }
+	my $scan_record=&scantron_parse_scanline($line,$i,\%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 (lc($checkid) eq lc($id)) { $found=$checkid;last; }
 	}
 	if ($found) {
+	    my $username=$idmap{$found};
 	    if ($found{'ids'}{$found}) {
-		#FIXME store away line we prviously saw the ID on
-		&scantron_get_correction($r,$i,$scan_record,$line,
-					 'duplicateID',$found);
+		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+					 $line,'duplicateID',$found);
+		return(1);
+	    } elsif ($found{'usernames'}{$username}) {
+		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+					 $line,'duplicateID',$username);
 		return(1);
-	    } else {
-		$found{'ids'}{$found}++;
 	    }
+	    #FIXME store away line we prviously saw the ID on to use above
+	    $found{'ids'}{$found}++;
+	    $found{'usernames'}{$username}++;
 	} else {
-	    &scantron_get_correction($r,$i,$scan_record,$line,
-				     'incorrectID');
-	    return(1);
+	    if ($id =~ /^\s*$/) {
+		my $username=&scan_data($scan_data,"$i.user");
+		if (defined($username) && $found{'usernames'}{$username}) {
+		    &scantron_get_correction($r,$i,$scan_record,
+					     \%scantron_config,
+					     $line,'duplicateID',$username);
+		    return(1);
+		} elsif (!defined($username)) {
+		    &scantron_get_correction($r,$i,$scan_record,
+					     \%scantron_config,
+					     $line,'incorrectID');
+		    return(1);
+		}
+		$found{'usernames'}{$username}++;
+	    } else {
+		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
+					 $line,'incorrectID');
+		return(1);
+	    }
 	}
     }
 
@@ -3575,18 +3932,18 @@ sub scantron_validate_ID {
 }
 
 sub scantron_get_correction {
-    my ($r,$i,$scan_record,$line,$error,$arg)=@_;
+    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.");
+    $r->print("<p><b>An error was detected ($error)</b>");
     if ( defined($$scan_record{'scantron.PaperID'}) ) {
-	$r->print("The current PaperID is <tt>".
+	$r->print(" for PaperID <tt>".
 		  $$scan_record{'scantron.PaperID'}."</tt> \n");
     } else {
-	$r->print("The current scanline is <pre>".
+	$r->print(" in scanline $i <pre>".
 		  $line."</pre> \n");
     }
     $r->print('<input type="hidden" name="scantron_corrections" value="'.$error.'" />'."\n");
@@ -3597,32 +3954,68 @@ sub scantron_get_correction {
 	} 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'}.",".
+	$r->print("<p>The ID on the form is  <tt>".
+		  $$scan_record{'scantron.ID'}."</tt><br />\n");
+	$r->print("The name on the 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'));
+	$r->print("<p>How should I handle this? <br /> \n");
+	$r->print("\n<ul><li> ");
 	#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'));
+				       'scantron_username','scantron_domain'));
+	$r->print(": <input type='text' name='scantron_username' value='' />");
+	$r->print("\n@".
+		 &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
+
+	$r->print('</li>');
     } elsif ($error eq 'doublebubble') {
-	$r->print("There have been muttiple bubbles scanned for a single question\n");
+#FIXME Need to print out who this is along with the paper info
+	$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
+	$r->print('<input type="hidden" name="scantron_questions" value="'.
+		  join(',',@{$arg}).'" />');
+	$r->print("<p>Please indicate which bubble should be used for grading</p>");
 	foreach my $question (@{$arg}) {
 	    my $selected=$$scan_record{"scantron.$question.answer"};
-	    $r->print("<p> For question $question, selected bubbles were".
-		      join(" ",split('',$selected)).
-		      " Please pick which one should be used for grading");
-	    #FIXMENEXT need to have radio buttons to chose which one to use
-	    
+	    &scantron_bubble_selector($r,$scan_config,$question,split('',$selected));
 	}
+    } elsif ($error eq 'missingbubble') {
+	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+	$r->print("<p>Please indicate which bubble should be used for grading</p>");
+	$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"};
+	    &scantron_bubble_selector($r,$scan_config,$question);
+	}
+    } else {
+	$r->print("\n<ul>");
     }
-    $r->print("</li> <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);
+    $r->print("\n</li></ul>");
+
+}
+
+sub scantron_bubble_selector {
+    my ($r,$scan_config,$quest,@selected)=@_;
+    my $max=$$scan_config{'Qlength'};
+    my @alphabet=('A'..'Z');
+    $r->print("<table border='1'><tr><td rowspan='2'>$quest</td>");
+    for (my $i=0;$i<$max+1;$i++) {
+	$r->print('<td align="center">');
+	if ($selected[0] eq $alphabet[$i]) { $r->print('X'); shift(@selected) }
+	else { $r->print('&nbsp;'); }
+	$r->print('</td>');
+    }
+    $r->print('<td></td></tr><tr>');
+    for (my $i=0;$i<$max;$i++) {
+	$r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
+		  '" value="'.$i.'" />'.$alphabet[$i]."</td>");
+    }
+    $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
+	      '" value="none" /> No bubble </td>');
+    $r->print('</tr></table>');
 }
 
 sub scantron_validate_CODE {
@@ -3639,37 +4032,65 @@ sub scantron_validate_doublebubble {
 
     #get scantron line setup
     my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
-    my $scanlines=&scantron_getfile();
+    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);
+	if ($line=~/^[\s\cz]*$/) { next; }
+	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+						 $scan_data);
 	if (!defined($$scan_record{'scantron.doubleerror'})) { next; }
-	&scantron_get_correction($r,$i,$scan_record,$line,'double',
+	&scantron_get_correction($r,$i,$scan_record,\%scantron_config,$line,
+				 'doublebubble',
 				 $$scan_record{'scantron.doubleerror'});
     	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_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=~/^[\s\cz]*$/) { next; }
+	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+						 $scan_data);
+	if (!defined($$scan_record{'scantron.missingerror'})) { next; }
+	my @to_correct;
+	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
+	    if ($missing > $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_process_students {
     my ($r) = @_;
-    my (undef,undef,$sequence)=split(/___/,$ENV{'form.selectpage'});
+    my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($ENV{'form.selectpage'});
     my ($symb,$url)=&get_symb_and_url($r);
     if (!$symb) {return '';}
     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 $navmap=Apache::lonnavmaps::navmap->new();
     my $map=$navmap->getResourceByUrl($sequence);
     my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
 #    $r->print("geto ".scalar(@resources)."<br />");
@@ -3683,36 +4104,36 @@ SCANTRONFORM
     my @delayqueue;
     my %completedstudents;
     
-    my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,
-	           'Scantron Status','Scantron Progress',scalar(@scanlines));
+    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();
-    foreach my $line (@scanlines) {
-	$r->print('<pre>line is'.$line.'</pre>');
-
-	chomp($line);
-	my $scan_record=&scantron_parse_scanline($line,\%scantron_config);
-	my ($uname,$udom);
-	unless ($uname=&scantron_find_student($scan_record,\%idmap)) {
-	    &scantron_add_delay(\@delayqueue,$line,
-				'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");
+    my $i=-1;
+    my ($uname,$udom);
+    while ($i<$scanlines->{'count'}) {
+ 	($uname,$udom)=('','');
+ 	$i++;
+ 	my $line=&scantron_get_line($scanlines,$i);
+ 	if ($line=~/^[\s\cz]*$/) { next; }
+ 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+ 						 $scan_data);
+ 	unless ($uname=&scantron_find_student($scan_record,$scan_data,
+ 					      \%idmap,$i)) {
+  	    &scantron_add_delay(\@delayqueue,$line,
+ 				'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;
+ 	}
+  	($uname,$udom)=split(/:/,$uname);
+  	&Apache::lonnet::delenv('form.counter');
+  	&Apache::lonnet::appenv(%$scan_record);
 	
-	    my $i=0;
+	my $i=0;
 	foreach my $resource (@resources) {
 	    $i++;
 	    my $result=&Apache::lonnet::ssi($resource->src(),
@@ -3722,23 +4143,6 @@ 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);
-	#    if ($i eq 3) {last;}
 	}
 	$completedstudents{$uname}={'line'=>$line};
     } continue {
@@ -3746,34 +4150,85 @@ SCANTRONFORM
 	&Apache::lonnet::delenv('scantron\.');
 	&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
 						 'last student');
-	#last;
-	#FIXME
-	#get iterator for $sequence
-	#foreach question 'submit' the students answer to the server
-	#   through grade target {
-	#   generate data to pass back that includes grade recevied
-	#}
     }
     &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
-	#  to repair student provided info
-	#Expected errors include
-	#  1 bad/no stuid/username
-	#  2 invalid bubblings
-	
+    $navmap->untieHashes();
+    $r->print("<p>Done</p>");
+    $r->print(&show_grading_menu_form($symb,$url));
+    return '';
+}
+
+sub scantron_upload_scantron_data {
+    my ($r)=@_;
+    $r->print(&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'}));
+    my $select_link=&Apache::loncommon::selectcourse_link('rules','courseid',
+							  'domainid');
+    my $domsel=&Apache::loncommon::select_dom_form($ENV{'request.role.domain'},
+						   'domainid');
+    my $default_form_data=&defaultFormData(&get_symb_and_url($r));
+    $r->print(<<UPLOAD);
+<script type="text/javascript" language="javascript">
+    function checkUpload(formname) {
+	if (formname.upfile.value == "") {
+	    alert("Please use the browse button to select a file from your local directory.");
+	    return false;
+	}
+	formname.submit();
     }
+</script>
+
+<form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
+$default_form_data
+Course: <input name='courseid' type='text' />
+Domain: $domsel $select_link
+<br />
+<input name='command' value='scantronupload_save' type='hidden' />
+File to upload:<input type="file" name="upfile" size="50" />
+<br />
+<input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+</form>
+UPLOAD
+    return '';
+}
+
+sub scantron_upload_scantron_data_save {
+    my($r)=@_;
+    if (!&Apache::lonnet::allowed('usc',$ENV{'form.domainid'}) &&
+	!&Apache::lonnet::allowed('usc',
+			    $ENV{'form.domainid'}.'_'.$ENV{'form.courseid'})) {
+	$r->print("You are not allowed to upload Scantron data to the requested course.<br />");
+	$r->print(&show_grading_menu_form(&get_symb_and_url($r)));
+	return '';
+    }
+    $r->print("Doing upload to ".$ENV{'form.courseid'}." <br />");
+    my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
+					 $ENV{'form.domainid'});
+    my $fname=$ENV{'form.upfile.filename'};
     #FIXME
-    # if delay queue exists 2 submits one to process delayed students one
-    #     to ignore delayed students, possibly saving the delay queue for later
-    
-    $navmap->untieHashes();
+    #copied from lonnet::userfileupload()
+    #make that function able to target a specified course
+    # Replace Windows backslashes by forward slashes
+    $fname=~s/\\/\//g;
+    # Get rid of everything but the actual filename
+    $fname=~s/^.*\/([^\/]+)$/$1/;
+    # Replace spaces by underscores
+    $fname=~s/\s+/\_/g;
+    # Replace all other weird characters by nothing
+    $fname=~s/[^\w\.\-]//g;
+    # See if there is anything left
+    unless ($fname) { return 'error: no uploaded file'; }
+    $fname='scantron_orig_'.$fname;
+    $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
+						    $ENV{'form.domainid'},
+						    $home,'upfile',$fname));
+    $r->print(&show_grading_menu_form(&get_symb_and_url($r)));
+    return '';
 }
+
+
 #-------- end of section for handling grading scantron forms -------
 #
 #-------------------------------------------------------------------
@@ -3825,7 +4280,7 @@ sub gradingmenu {
 	}
 	formname.command.value = cmd;
 	formname.saveState.value = "saveCmd="+cmdsave+":saveSec="+pullDownSelection(formname.section)+
-	    ":saveSub="+radioSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
+	    ":saveSub="+pullDownSelection(formname.submitonly)+":saveStatus="+pullDownSelection(formname.Status);
 	if (val < 5) formname.submit();
 	if (val == 5) {
 	    if (!checkReceiptNo(formname,'notOK')) { return false;}
@@ -3876,29 +4331,34 @@ GRADINGMENUJS
 
     $result.='<table width="100%" border=0>';
     $result.='<tr bgcolor="#ffffe6" valign="top"><td>'."\n".
-	'&nbsp;Select Section: <select name="section">'."\n";
+	'&nbsp;'.&mt('Select Section').': <select name="section">'."\n";
     if (ref($sections)) {
-	foreach (sort (@$sections)) {$result.='<option value="'.$_.'" '.
-					 ($saveSec eq $_ ? 'selected="on"' : '').'>'.$_.'</option>'."\n";}
+	foreach (sort (@$sections)) {
+	    $result.='<option value="'.$_.'" '.
+		($saveSec eq $_ ? 'selected="on"':'').'>'.$_.'</option>'."\n";
+	}
     }
     $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
 
-    $result.='Student Status:</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
+    $result.=&mt('Student Status').':</b>'.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,undef);
 
-    if (ref($sections)) {
-	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />' 
-	    if (grep /no/,@$sections);
+    if (ref($sections) && (grep /no/,@$sections)) {
+	$result.='&nbsp;(Section "no" implies the students were not assigned a section.)<br />';
     }
     $result.='</td></tr>';
 
     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
 	'<input type="radio" name="radioChoice" value="submission" '.
-	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>Current Resource:</b> For one or more students'.
-	'<br />&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;&nbsp; &nbsp;-->For students with '.
-	'<input type="radio" name="submitonly" value="yes" '.
-	($saveSub eq 'yes' ? 'checked' : '').' /> submissions or '.
-	'<input type="radio" name="submitonly" value="all" '.
-	($saveSub eq 'all' ? 'checked' : '').' /> for all</td></tr>'."\n";
+	($saveCmd eq 'submission' ? 'checked' : '').'> '.'<b>'.&mt('Current Resource').':</b> '.&mt('For one or more students').
+	' <select name="submitonly">'.
+	'<option value="yes" '.
+	($saveSub eq 'yes' ? 'selected="on"' : '').'>with submissions</option>'.
+	'<option value="graded" '.
+	($saveSub eq 'graded' ? 'selected="on"' : '').'>with ungraded submissions</option>'.
+	'<option value="incorrect" '.
+	($saveSub eq 'incorrect' ? 'selected="on"' : '').'>with incorrect submissions</option>'.
+	'<option value="all" '.
+	($saveSub eq 'all' ? 'selected="on"' : '').'>with any status</option></select></td></tr>'."\n";
 
     $result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
 	'<input type="radio" name="radioChoice" value="viewgrades" '.
@@ -3944,23 +4404,27 @@ sub handler {
 
     undef(%perm);
     if ($ENV{'browser.mathml'}) {
-	$request->content_type('text/xml');
+	&Apache::loncommon::content_type($request,'text/xml');
     } else {
-	$request->content_type('text/html');
+	&Apache::loncommon::content_type($request,'text/html');
     }
     $request->send_http_header;
     return '' if $request->header_only;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'});
     my $url=$ENV{'form.url'};
     my $symb=$ENV{'form.symb'};
-    my $command=$ENV{'form.command'};
+    my @commands=&Apache::loncommon::get_env_multiple('form.command');
+    my $command=$commands[0];
+    if ($#commands > 0) {
+	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
+    }
     if (!$url) {
 	my ($temp1,$temp2);
-	($temp1,$temp2,$ENV{'form.url'})=split(/___/,$symb);
+	($temp1,$temp2,$ENV{'form.url'})=&Apache::lonnet::decode_symb($symb);
 	$url = $ENV{'form.url'};
     }
     &send_header($request);
-    if ($url eq '' && $symb eq '') {
+    if ($url eq '' && $symb eq '' && $command eq '') {
 	if ($ENV{'user.adv'}) {
 	    if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
 		($ENV{'form.codethree'})) {
@@ -3969,7 +4433,7 @@ sub handler {
 		my ($tsymb,$tuname,$tudom,$tcrsid)=
 		    &Apache::lonnet::checkin($token);
 		if ($tsymb) {
-		    my ($map,$id,$url)=split(/\_\_\_/,$tsymb);
+		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
 		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
 			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
 					  ('grade_username' => $tuname,
@@ -4001,7 +4465,6 @@ sub handler {
 		delete($perm{'mgr'});
 	    }
 	}
-
 	if ($command eq 'submission' && $perm{'vgr'}) {
 	    ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
 	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
@@ -4041,12 +4504,25 @@ 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_validate' && $perm{'mgr'}) {
 	    $request->print(&scantron_validate_file($request));
 	} elsif ($command eq 'scantron_process' && $perm{'mgr'}) {
 	    $request->print(&scantron_process_students($request));
+ 	} elsif ($command eq 'scantronupload' && 
+ 		 (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})||
+		  &Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
+ 	    $request->print(&scantron_upload_scantron_data($request)); 
+ 	} elsif ($command eq 'scantronupload_save' &&
+ 		 (&Apache::lonnet::allowed('usc',$ENV{'request.role.domain'})||
+		  &Apache::lonnet::allowed('usc',$ENV{'request.course.id'}))) {
+ 	    $request->print(&scantron_upload_scantron_data_save($request));
+ 	} elsif ($command eq 'scantrondownload' &&
+		 &Apache::lonnet::allowed('usc',$ENV{'request.course.id'})) {
+ 	    $request->print(&scantron_download_scantron_data($request));
 	} elsif ($command) {
-	    $request->print("Access Denied");
+	    $request->print("Access Denied ($command)");
 	}
     }
     &send_footer($request);
@@ -4062,6 +4538,7 @@ sub send_header {
 #remotewindow.close();
 #</script>"); 
     $request->print(&Apache::loncommon::bodytag('Grading'));
+    $request->rflush();
 }
 
 sub send_footer {