--- loncom/homework/grades.pm	2003/11/21 21:31:34	1.160
+++ loncom/homework/grades.pm	2005/08/09 15:53:20	1.277
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.160 2003/11/21 21:31:34 albertel Exp $
+# $Id: grades.pm,v 1.277 2005/08/09 15:53:20 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -25,16 +25,6 @@
 #
 # http://www.lon-capa.org/
 #
-# 2/9,2/13 Guy Albertelli
-# 6/8 Gerd Kortemeyer
-# 7/26 H.K. Ng
-# 8/20 Gerd Kortemeyer
-# Year 2002
-# June-August H.K. Ng
-# Year 2003
-# February, March H.K. Ng
-# July, H. K. Ng
-#
 
 package Apache::grades;
 use strict;
@@ -48,6 +38,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=();
@@ -88,30 +79,16 @@ sub getpartlist {
 
 # --- Get the symbolic name of a problem and the url
 sub get_symb_and_url {
-    my ($request) = @_;
-    (my $url=$ENV{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-    my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
-    if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
-    return ($symb,$url);
-}
-
-# --- Retrieve the fullname for a user. Return lastname, first middle ---
-# --- Generation is attached next to the lastname if it exists. ---
-sub get_fullname {
-    my ($uname,$udom) = @_;
-    my %name=&Apache::lonnet::get('environment', ['lastname','generation',
-						  'firstname','middlename'],
-                                  $udom,$uname);
-    my $fullname;
-    my ($tmp) = keys(%name);
-    if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-        $fullname = &Apache::loncoursedata::ProcessFullName
-            (@name{qw/lastname generation firstname middlename/});
-    } else {
-        &Apache::lonnet::logthis('grades.pm: no name data for '.$uname.
-                                 '@'.$udom.':'.$tmp);
+    my ($request,$silent) = @_;
+    (my $url=$env{'form.url'}) =~ s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
+    if ($symb eq '') { 
+	if (!$silent) {
+	    $request->print("Unable to handle ambiguous references:$url:.");
+	    return ();
+	}
     }
-    return $fullname;
+    return ($symb,$url);
 }
 
 #--- Format fullname, username:domain if different for display
@@ -119,10 +96,10 @@ sub get_fullname {
 sub nameUserString {
     my ($type,$fullname,$uname,$udom) = @_;
     if ($type eq 'header') {
-	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>&nbsp;';
+	return '<b>&nbsp;Fullname&nbsp;</b><font color="#999999">(Username)</font>';
     } else {
 	return '&nbsp;'.$fullname.'<font color="#999999">&nbsp;('.$uname.
-	    ($ENV{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
+	    ($env{'user.domain'} eq $udom ? '' : ' ('.$udom.')').')</font>';
     }
 }
 
@@ -130,7 +107,7 @@ sub nameUserString {
 #--- Indicate if a response type is coded handgraded or not. ---
 sub response_type {
     my ($url,$symb) = shift;
-    $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url))) if ($symb eq '');
+    $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')) {
@@ -161,6 +138,21 @@ sub response_type {
     return \@partlist,\%handgrade,\%responseType;
 }
 
+sub get_display_part {
+    my ($partID,$url,$symb)=@_;
+    if (!defined($symb) || $symb eq '') {
+	$symb=$env{'form.symb'};
+	if ($symb eq '') { $symb=&Apache::lonnet::symbread($url) }
+    }
+    my $display=&Apache::lonnet::EXT('resource.'.$partID.'.display',$symb);
+    if (defined($display) and $display ne '') {
+	$display.= " (<font color=\"#999900\">id $partID</font>)";
+    } else {
+	$display=$partID;
+    }
+    return $display;
+}
+
 #--- Show resource title
 #--- and parts and response type
 sub showResourceInfo {
@@ -168,7 +160,7 @@ sub showResourceInfo {
     my $col=3;
     if ($checkboxes) { $col=4; }
     my $result ='<table border="0">'.
-	'<tr><td colspan="'.$col.'"><font size="+1"><b>Current Resource: </b>'.
+	'<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 = ();
@@ -188,7 +180,8 @@ sub showResourceInfo {
 	    }
 	    $partsseen{$partID}=1;
 	}
-	$result.='<td><b>Part </b>'.$partID.' <font color="#999999">'.
+	my $display_part=&get_display_part($partID,$url);
+	$result.='<td><b>Part: </b>'.$display_part.' <font color="#999999">'.
 	    $resID.'</font></td>'.
 	    '<td><b>Type: </b>'.$responsetype.'</td></tr>';
 #	    '<td><b>Handgrade: </b>'.$handgrade.'</td></tr>';
@@ -207,7 +200,7 @@ sub get_order {
 				       ('grade_domain' => $udom),
 				       ('grade_symb' => $symb),
 				       ('grade_courseid' => 
-					        $ENV{'request.course.id'}),
+					        $env{'request.course.id'}),
 				       ('grade_username' => $uname));
     (undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
     my %analyze=&Apache::lonnet::str2hash($subresult);
@@ -278,19 +271,25 @@ sub cleanRecord {
 	    '<tr valign="top"><td>'.$grayFont.'Option ID</font></td>'.
 	    $grayFont.$bottomrow.'</tr>'.'</table></blockquote>';
     } elsif ($response eq 'essay') {
-	if (! exists ($ENV{'form.'.$symb})) {
+	if (! exists ($env{'form.'.$symb})) {
 	    my (%keyhash) = &Apache::lonnet::dump('nohist_handgrade',
-						  $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-						  $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+						  $env{'course.'.$env{'request.course.id'}.'.domain'},
+						  $env{'course.'.$env{'request.course.id'}.'.num'});
 
-	    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
-	    $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
-	    $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
-	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
-	    $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><pre>'.&keywords_highlight($answer).'</pre></blockquote>';
+	    my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
+	    $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+	    $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+	    $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.
+	}
+	$answer =~ s-\n-<br />-g;
+	return '<br /><br /><blockquote><tt>'.&keywords_highlight($answer).'</tt></blockquote>';
+    } elsif ( $response eq 'organic') {
+	my $result='Smile representation: "<tt>'.$answer.'</tt>"';
+	my $jme=$record->{$version."resource.$partid.$respid.molecule"};
+	$result.=&Apache::chemresponse::jme_img($jme,$answer,400);
+	return $result;
     }
     return $answer;
 }
@@ -342,27 +341,36 @@ sub getclasslist {
     #
     my %sections;
     my %fullnames;
-    foreach (keys(%$classlist)) {
-        # the following undefs are for 'domain', and 'username' respectively.
-	my (undef,undef,$end,$start,$id,$section,$fullname,$status)=
-            @{$classlist->{$_}};
+    foreach my $student (keys(%$classlist)) {
+        my $end      = 
+            $classlist->{$student}->[&Apache::loncoursedata::CL_END()];
+        my $start    = 
+            $classlist->{$student}->[&Apache::loncoursedata::CL_START()];
+        my $id       = 
+            $classlist->{$student}->[&Apache::loncoursedata::CL_ID()];
+        my $section  = 
+            $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
+        my $fullname = 
+            $classlist->{$student}->[&Apache::loncoursedata::CL_FULLNAME()];
+        my $status   = 
+            $classlist->{$student}->[&Apache::loncoursedata::CL_STATUS()];
 	# filter students according to status selected
-	if ($filterlist && $ENV{'form.Status'} ne 'Any') {
-	    if ($ENV{'form.Status'} ne $status) {
-		delete ($classlist->{$_});
+	if ($filterlist && $env{'form.Status'} ne 'Any') {
+	    if ($env{'form.Status'} ne $status) {
+		delete ($classlist->{$student});
 		next;
 	    }
 	}
-	$section = ($section ne '' ? $section : 'no');
+	$section = ($section ne '' ? $section : 'none');
 	if (&canview($section)) {
 	    if ($getsec eq 'all' || $getsec eq $section) {
 		$sections{$section}++;
-		$fullnames{$_}=$fullname;
+		$fullnames{$student}=$fullname;
 	    } else {
-		delete($classlist->{$_});
+		delete($classlist->{$student});
 	    }
 	} else {
-	    delete($classlist->{$_});
+	    delete($classlist->{$student});
 	}
     }
     my %seen = ();
@@ -413,7 +421,7 @@ sub canview {
 #--- Retrieve the grade status of a student for all the parts
 sub student_gradeStatus {
     my ($url,$symb,$udom,$uname,$partlist) = @_;
-    my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+    my %record     = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
     my %partstatus = ();
     foreach (@$partlist) {
 	my ($status,undef)   = split(/_/,$record{"resource.$_.solved"},2);
@@ -440,9 +448,9 @@ sub jscriptNform {
     $jscript.= '<form action="/adm/grades" method="post" name="onestudent">'."\n".
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
-	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n".
-	'<input type="hidden" name="Status"  value="'.$ENV{'form.Status'}.'" />'."\n".
+	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n".
+	'<input type="hidden" name="Status"  value="'.$env{'form.Status'}.'" />'."\n".
 	'<input type="hidden" name="command" value="submission" />'."\n".
 	'<input type="hidden" name="student" value="" />'."\n".
 	'<input type="hidden" name="userdom" value="" />'."\n".
@@ -503,34 +511,43 @@ sub most_similar {
 sub verifyreceipt {
     my $request  = shift;
 
-    my $courseid = $ENV{'request.course.id'};
-    my $receipt  = unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).'-'.
-	$ENV{'form.receipt'};
+    my $courseid = $env{'request.course.id'};
+    my $receipt  = &Apache::lonnet::recprefix($courseid).'-'.
+	$env{'form.receipt'};
     $receipt     =~ s/[^\-\d]//g;
-    my $url      = $ENV{'form.url'};
-    my $symb     = $ENV{'form.symb'};
+    my $url      = $env{'form.url'};
+    my $symb     = $env{'form.symb'};
     unless ($symb) {
 	$symb    = &Apache::lonnet::symbread($url);
     }
 
     my $title.='<h3><font color="#339933">Verifying Submission Receipt '.
 	$receipt.'</h3></font>'."\n".
-	'<font size=+1><b>Resource: </b>'.$ENV{'form.probTitle'}.'</font><br><br>'."\n";
+	'<font size=+1><b>Resource: </b>'.$env{'form.probTitle'}.'</font><br><br>'."\n";
 
     my ($string,$contents,$matches) = ('','',0);
     my (undef,undef,$fullname) = &getclasslist('all','0');
-
+    
+    my $receiptparts=0;
+    if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+    my $parts=['0'];
+    if ($receiptparts) { ($parts)=&response_type($url,$symb); }
     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
 	my ($uname,$udom)=split(/\:/);
-	if ($receipt eq 
-	    &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb)) {
-	    $contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
-		'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
-		'\')"; TARGET=_self>'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
-		'<td>&nbsp;'.$uname.'&nbsp;</td>'.
-		'<td>&nbsp;'.$udom.'&nbsp;</td></tr>'."\n";
-	    
-	    $matches++;
+	foreach my $part (@$parts) {
+	    if ($receipt eq &Apache::lonnet::ireceipt($uname,$udom,$courseid,$symb,$part)) {
+		$contents.='<tr bgcolor="#ffffe6"><td>&nbsp;'."\n".
+		    '<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
+		    '\')"; TARGET=_self>'.$$fullname{$_}.'</a>&nbsp;</td>'."\n".
+		    '<td>&nbsp;'.$uname.'&nbsp;</td>'.
+		    '<td>&nbsp;'.$udom.'&nbsp;</td>';
+		if ($receiptparts) {
+		    $contents.='<td>&nbsp;'.$part.'&nbsp;</td>';
+		}
+		$contents.='</tr>'."\n";
+		
+		$matches++;
+	    }
 	}
     }
     if ($matches == 0) {
@@ -543,8 +560,11 @@ sub verifyreceipt {
 	    '<table border="0"><tr bgcolor="#e6ffff">'."\n".
 	    '<td><b>&nbsp;Fullname&nbsp;</b></td>'."\n".
 	    '<td><b>&nbsp;Username&nbsp;</b></td>'."\n".
-	    '<td><b>&nbsp;Domain&nbsp;</b></td></tr>'."\n".
-	    $contents.
+	    '<td><b>&nbsp;Domain&nbsp;</b></td>';
+	if ($receiptparts) {
+	    $string.='<td>&nbsp;Problem Part&nbsp;</td>';
+	}
+	$string.='</tr>'."\n".$contents.
 	    '</table></td></tr></table>'."\n";
     }
     return $string.&show_grading_menu_form($symb,$url);
@@ -558,19 +578,19 @@ sub listStudents {
     my ($request) = shift;
 
     my ($symb,$url) = &get_symb_and_url($request);
-    my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
-    my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
-    my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
-    my $submitonly= $ENV{'form.submitonly'} eq '' ? 'all' : $ENV{'form.submitonly'};
-
-    my $viewgrade = $ENV{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
-    $ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ? 
-	&Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
+    my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
+    my $cnum      = $env{"course.$env{'request.course.id'}.num"};
+    my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+    my $submitonly= $env{'form.submitonly'} eq '' ? 'all' : $env{'form.submitonly'};
+
+    my $viewgrade = $env{'form.showgrading'} eq 'yes' ? 'View/Grade/Regrade' : 'View';
+    $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
+	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
 
     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'},($ENV{'form.showgrading'} eq 'yes'));
+    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">
@@ -608,40 +628,40 @@ LISTJAVASCRIPT
     &commonJSfunctions($request);
     $request->print($result);
 
-    my $checkhdgrade = ($ENV{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1 ) ? 'checked' : '';
+    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".$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>View Problem Text: </b><label><input type="radio" name="vProb" value="no" checked="on" /> no </label>'."\n".
+	'<label><input type="radio" name="vProb" value="yes" /> one student </label>'."\n".
+	'<label><input type="radio" name="vProb" value="all" /> all students </label><br />'."\n".
+	'&nbsp;<b>View Answer: </b><label><input type="radio" name="vAns" value="no"  /> no </label>'."\n".
+	'<label><input type="radio" name="vAns" value="yes" /> one student </label>'."\n".
+	'<label><input type="radio" name="vAns" value="all" checked="on" /> all students </label><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";
+    if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
+	$gradeTable.='<label><input type="radio" name="lastSub" value="hdgrade" '.$checkhdgrade.' /> essay part only </label>'."\n";
     }
 
-    my $saveStatus = $ENV{'form.Status'} eq '' ? 'Active' : $ENV{'form.Status'};
-    $ENV{'form.Status'} = $saveStatus;
+    my $saveStatus = $env{'form.Status'} eq '' ? 'Active' : $env{'form.Status'};
+    $env{'form.Status'} = $saveStatus;
 
-    $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".
+    $gradeTable.='<label><input type="radio" name="lastSub" value="lastonly" '.$checklastsub.' /> last submission only </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="last" /> last submission & parts info </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="datesub" /> by dates and submissions </label>'."\n".
+	'<label><input type="radio" name="lastSub" value="all" /> all details</label>'."\n".
 	'<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
 	'<input type="hidden" name="submitonly"  value="'.$submitonly.'" />'."\n".
-	'<input type="hidden" name="handgrade"   value="'.$ENV{'form.handgrade'}.'" /><br />'."\n".
-	'<input type="hidden" name="showgrading" value="'.$ENV{'form.showgrading'}.'" /><br />'."\n".
-	'<input type="hidden" name="saveState"   value="'.$ENV{'form.saveState'}.'" />'."\n".
-	'<input type="hidden" name="probTitle"   value="'.$ENV{'form.probTitle'}.'" />'."\n".
+	'<input type="hidden" name="handgrade"   value="'.$env{'form.handgrade'}.'" /><br />'."\n".
+	'<input type="hidden" name="showgrading" value="'.$env{'form.showgrading'}.'" /><br />'."\n".
+	'<input type="hidden" name="saveState"   value="'.$env{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="probTitle"   value="'.$env{'form.probTitle'}.'" />'."\n".
 	'<input type="hidden" name="url"  value="'.$url.'" />'."\n".
 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="saveStatusOld" value="'.$saveStatus.'" />'."\n";
 
-    if (exists($ENV{'form.gradingMenu'}) && exists($ENV{'form.Status'})) {
-	$gradeTable.='<input type="hidden" name="Status"   value="'.$ENV{'form.Status'}.'" />'."\n";
+    if (exists($env{'form.gradingMenu'}) && exists($env{'form.Status'})) {
+	$gradeTable.='<input type="hidden" name="Status"   value="'.$env{'form.Status'}.'" />'."\n";
     } else {
 	$gradeTable.='<b>Student Status:</b> '.
 	    &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);').'<br />';
@@ -650,20 +670,26 @@ LISTJAVASCRIPT
     $gradeTable.='To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
 	'next to the student\'s name(s). Then click on the Next button.<br />'."\n".
 	'<input type="hidden" name="command" value="processGroup" />'."\n";
+
+# checkall buttons
+    $gradeTable.=&check_script('gradesub', 'stuinfo');
     $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');  
+	'value="Next->" /> <br />'."\n";
+    $gradeTable.=&check_buttons();
+    $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="on" />Check For Plagiarism</label>';
+    my ($classlist, undef, $fullname) = &getclasslist($getsec,'1');
     $gradeTable.='<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">';
     my $loop = 0;
     while ($loop < 2) {
 	$gradeTable.='<td><b>&nbsp;No.</b>&nbsp;</td><td><b>&nbsp;Select&nbsp;</b></td>'.
-	    '<td>'.&nameUserString('header').'</td>';
-	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	    '<td>'.&nameUserString('header').'&nbsp;Section/Group</td>';
+	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 	    foreach (sort(@$partlist)) {
-		$gradeTable.='<td><b>&nbsp;Part '.(split(/_/))[0].' Status&nbsp;</b></td>';
+		my $display_part=&get_display_part((split(/_/))[0],$url,$symb);
+		$gradeTable.='<td><b>&nbsp;Part: '.$display_part.
+		    ' Status&nbsp;</b></td>';
 	    }
 	}
 	$loop++;
@@ -675,13 +701,16 @@ LISTJAVASCRIPT
     foreach my $student (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
 	my ($uname,$udom) = split(/:/,$student);
 	my %status = ();
-	if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 	    (%status) =&student_gradeStatus($url,$symb,$udom,$uname,$partlist);
 	    my $submitted = 0;
-	    my $graded = 1;
+	    my $graded = 0;
+	    my $incorrect = 0;
 	    foreach (keys(%status)) {
 		$submitted = 1 if ($status{$_} ne 'nothing');
-		$graded = 0 if ($status{$_} =~ /^correct/);
+		$graded = 1 if ($status{$_} =~ /^ungraded/);
+		$incorrect = 1 if ($status{$_} =~ /^incorrect/);
+		
 		my ($foo,$partid,$foo1) = split(/\./,$_);
 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
 		    $submitted = 0;
@@ -691,25 +720,30 @@ LISTJAVASCRIPT
 			$status{'resource.'.$partid.'.submitted_by'}.'" />';
 		}
 	    }
+	    
 	    next if (!$submitted && ($submitonly eq 'yes' ||
 				     $submitonly eq 'incorrect' ||
 				     $submitonly eq 'graded'));
-	    next if (!$graded && ($submitonly eq 'graded' ||
-				  $submitonly eq 'incorrect'));
+	    next if (!$graded && ($submitonly eq 'graded'));
+	    next if (!$incorrect && $submitonly eq 'incorrect');
 	}
 
 	$ctr++;
+	my $section = $classlist->{$student}->[&Apache::loncoursedata::CL_SECTION()];
+
 	if ( $perm{'vgr'} eq 'F' ) {
 	    $gradeTable.='<tr bgcolor="#ffffe6">' if ($ctr%2 ==1);
 	    $gradeTable.='<td align="right">'.$ctr.'&nbsp;</td>'.
-		'<td align="center"><input type=checkbox name="stuinfo" value="'.
-		$student.':'.$$fullname{$student}.'&nbsp;"></td>'."\n".
-		'<td>'.&nameUserString(undef,$$fullname{$student},$uname,$udom).'</td>'."\n";
+               '<td align="center"><label><input type=checkbox name="stuinfo" value="'.
+               $student.':'.$$fullname{$student}.':::SECTION'.$section.
+	       ')&nbsp;" />&nbsp;&nbsp;</label></td>'."\n".'<td>'.
+	       &nameUserString(undef,$$fullname{$student},$uname,$udom).
+	       '&nbsp;'.$section.'</td>'."\n";
 
-	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 		foreach (sort keys(%status)) {
 		    next if (/^resource.*?submitted_by$/);
-		    $gradeTable.='<td align="middle">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
+		    $gradeTable.='<td align="center">&nbsp;'.$status{$_}.'&nbsp;</td>'."\n";
 		}
 	    }
 #	    $gradeTable.='<td></td>' if ($ctr%2 ==1);
@@ -718,7 +752,7 @@ LISTJAVASCRIPT
     }
     if ($ctr%2 ==1) {
 	$gradeTable.='<td>&nbsp;</td><td>&nbsp;</td><td>&nbsp;</td>';
-	    if ($ENV{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
+	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
 		foreach (@$partlist) {
 		    $gradeTable.='<td>&nbsp;</td>';
 		}
@@ -726,7 +760,7 @@ LISTJAVASCRIPT
 	$gradeTable.='</tr>';
     }
 
-    $gradeTable.='</table></td></tr></table>'.
+    $gradeTable.='</table></td></tr></table>'."\n".
 	'<input type="button" '.
 	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
 	'value="Next->" /></form>'."\n";
@@ -735,9 +769,12 @@ LISTJAVASCRIPT
 	if ($num_students eq 0) {
 	    $gradeTable='<br />&nbsp;<font color="red">There are no students currently enrolled.</font>';
 	} else {
+	    my $submissions='submissions';
+	    if ($submitonly eq 'incorrect') { $submissions = 'incorrect submissions'; }
+	    if ($submitonly eq 'graded'   ) { $submissions = 'ungraded submissions'; }
 	    $gradeTable='<br />&nbsp;<font color="red">'.
-		'No submissions found for this resource for any students. ('.$num_students.
-		' checked for submissions)</font><br />';
+		'No '.$submissions.' found for this resource for any students. ('.$num_students.
+		' students checked for '.$submissions.')</font><br />';
 	}
     } elsif ($ctr == 1) {
 	$gradeTable =~ s/type=checkbox/type=checkbox checked/;
@@ -748,6 +785,52 @@ LISTJAVASCRIPT
 }
 
 #---- Called from the listStudents routine
+
+sub check_script {
+    my ($form, $type)=@_;
+    my $chkallscript='<script type="text/javascript">
+    function checkall() {
+        for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+            ele = document.forms.'.$form.'.elements[i];
+            if (ele.name == "'.$type.'") {
+            document.forms.'.$form.'.elements[i].checked=true;
+                                       }
+        }
+    }
+
+    function checksec() {
+        for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+            ele = document.forms.'.$form.'.elements[i];
+           string = document.forms.'.$form.'.chksec.value;
+           if
+          (ele.value.indexOf(":::SECTION"+string)>0) {
+              document.forms.'.$form.'.elements[i].checked=true;
+            }
+        }
+    }
+
+
+    function uncheckall() {
+        for (i=0; i<document.forms.'.$form.'.elements.length; i++) {
+            ele = document.forms.'.$form.'.elements[i];
+            if (ele.name == "'.$type.'") {
+            document.forms.'.$form.'.elements[i].checked=false;
+                                       }
+        }
+    }
+
+</script>'."\n";
+    return $chkallscript;
+}
+
+sub check_buttons {
+    my $buttons.='<input type="button" onclick="checkall()" value="Check All" />';
+    $buttons.='<input type="button" onclick="uncheckall()" value="Uncheck All" />&nbsp;';
+    $buttons.='<input type="button" onclick="checksec()" value="Check Section/Group" />';
+    $buttons.='<input type="text" size="5" name="chksec" />&nbsp;';
+    return $buttons;
+}
+
 #     Displays the submissions for one student or a group of students
 sub processGroup {
     my ($request)  = shift;
@@ -757,9 +840,9 @@ sub processGroup {
 
     foreach (@stuchecked) {
 	my ($uname,$udom,$fullname) = split(/:/);
-	$ENV{'form.student'}        = $uname;
-	$ENV{'form.userdom'}        = $udom;
-	$ENV{'form.fullname'}       = $fullname;
+	$env{'form.student'}        = $uname;
+	$env{'form.userdom'}        = $udom;
+	$env{'form.fullname'}       = $fullname;
 	&submission($request,$ctr,$total);
 	$ctr++;
     }
@@ -952,6 +1035,8 @@ sub sub_page_kw_js {
     my $request = shift;
     my $iconpath = $request->dir_config('lonIconsURL');
     &commonJSfunctions($request);
+    my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
+    $docopen=~s/^document\.//;
     $request->print(<<SUBJAVASCRIPT);
 <script type="text/javascript" language="javascript">
 
@@ -1061,10 +1146,10 @@ sub sub_page_kw_js {
     var ypos = (screen.height-height)/2-30;
     ypos = (ypos < 0) ? '0' : ypos;
 
-    pWin = window.open('', 'MessageCenter', 'toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
+    pWin = window.open('', 'MessageCenter', 'resizable=yes,toolbar=no,location=no,scrollbars='+scrollbar+',screenx='+xpos+',screeny='+ypos+',width=600,height='+height);
     pWin.focus();
     pDoc = pWin.document;
-    pDoc.open('text/html','replace');
+    pDoc.$docopen;
     pDoc.write("<html><head>");
     pDoc.write("<title>Message Central</title>");
 
@@ -1192,10 +1277,10 @@ sub sub_page_kw_js {
     var ypos = (screen.height-330)/2-30;
     ypos = (ypos < 0) ? '0' : ypos;
 
-    hwdWin = window.open('', 'KeywordHighlightCentral', 'toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
+    hwdWin = window.open('', 'KeywordHighlightCentral', 'resizeable=yes,toolbar=no,location=no,scrollbars=no,width=400,height=300,screenx='+xpos+',screeny='+ypos);
     hwdWin.focus();
     var hDoc = hwdWin.document;
-    hDoc.open('text/html','replace');
+    hDoc.$docopen;
     hDoc.write("<html><head>");
     hDoc.write("<title>Highlight Central</title>");
 
@@ -1266,16 +1351,25 @@ sub gradeBox {
 		  '' : $$record{'resource.'.$partid.'.awarded'}*$wgt);
     my $result='<input type="hidden" name="WGT'.$counter.'_'.$partid.'" value="'.$wgt.'" />'."\n";
 
+    my $display_part=&get_display_part($partid,undef,$symb);
+
+    my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+				       [$partid]);
+    my $aggtries = $$record{'resource.'.$partid.'.tries'};
+    if ($last_resets{$partid}) {
+        $aggtries = &get_num_tries($record,$last_resets{$partid},$partid);
+    }
+
     $result.='<table border="0"><tr><td>'.
-	'<b>Part </b>'.$partid.' <b>Points: </b></td><td>'."\n";
+	'<b>Part: </b>'.$display_part.' <b>Points: </b></td><td>'."\n";
 
     my $ctr = 0;
     $result.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
     while ($ctr<=$wgt) {
-	$result.= '<td><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+	$result.= '<td><nobr><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
 	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
 	    $ctr.')" value="'.$ctr.'" '.
-	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</td>\n";
+	    ($score eq $ctr ? 'checked':'').' /> '.$ctr."</nobr></td>\n";
 	$result.=(($ctr+1)%10 == 0 ? '</tr><tr>' : '');
 	$ctr++;
     }
@@ -1304,7 +1398,11 @@ sub gradeBox {
     $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
 	'<input type="hidden" name="oldpts'.$counter.'_'.$partid.'" value="'.$score.'" />'."\n".
 	'<input type="hidden" name="solved'.$counter.'_'.$partid.'" value="'.
-	$$record{'resource.'.$partid.'.solved'}.'" />'."\n";
+	$$record{'resource.'.$partid.'.solved'}.'" />'."\n".
+        '<input type="hidden" name="totaltries'.$counter.'_'.$partid.'" value="'.
+        $$record{'resource.'.$partid.'.tries'}.'" />'."\n".
+        '<input type="hidden" name="aggtries'.$counter.'_'.$partid.'" value="'.
+        $aggtries.'" />'."\n";
     $result.='</td></tr></table>'."\n";
     return $result;
 }
@@ -1314,7 +1412,7 @@ sub show_problem {
     my $rendered;
     if ($mode eq 'both' or $mode eq 'text') {
 	$rendered=&Apache::loncommon::get_student_view($symb,$uname,$udom,
-					     $ENV{'request.course.id'});
+					     $env{'request.course.id'});
     }
     if ($removeform) {
 	$rendered=~s|<form(.*?)>||g;
@@ -1324,7 +1422,7 @@ sub show_problem {
     my $companswer;
     if ($mode eq 'both' or $mode eq 'answer') {
 	$companswer=&Apache::loncommon::get_student_answers($symb,$uname,$udom,
-						    $ENV{'request.course.id'});
+						    $env{'request.course.id'});
     }
     if ($removeform) {
 	$companswer=~s|<form(.*?)>||g;
@@ -1340,7 +1438,7 @@ sub show_problem {
 	} else {
 	    $result.='Correct answer: ';
 	}
-	$result.=$ENV{'form.fullname'}.'</b></td></tr>';
+	$result.=$env{'form.fullname'}.'</b></td></tr>';
     }
     if ($mode eq 'both') {
 	$result.='<tr><td bgcolor="#ffffff">'.$rendered.'<br />';
@@ -1359,38 +1457,41 @@ sub show_problem {
 sub submission {
     my ($request,$counter,$total) = @_;
 
-    (my $url=$ENV{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
-    my ($uname,$udom)     = ($ENV{'form.student'},$ENV{'form.userdom'});
-    $udom = ($udom eq '' ? $ENV{'user.domain'} : $udom); #has form.userdom changed for a student?
-    my $usec = &Apache::lonnet::getsection($udom,$uname,$ENV{'request.course.id'});
-    $ENV{'form.fullname'} = &get_fullname ($uname,$udom) if $ENV{'form.fullname'} eq '';
+    (my $url=$env{'form.url'})=~s-^http://($ENV{'SERVER_NAME'}|$ENV{'HTTP_HOST'})--;
+    my ($uname,$udom)     = ($env{'form.student'},$env{'form.userdom'});
+    $udom = ($udom eq '' ? $env{'user.domain'} : $udom); #has form.userdom changed for a student?
+    my $usec = &Apache::lonnet::getsection($udom,$uname,$env{'request.course.id'});
+    $env{'form.fullname'} = &Apache::loncommon::plainname($uname,$udom,'lastname') if $env{'form.fullname'} eq '';
 
-    my $symb=($ENV{'form.symb'} ne '' ? $ENV{'form.symb'} : (&Apache::lonnet::symbread($url)));
+    my $symb=($env{'form.symb'} ne '' ? $env{'form.symb'} : (&Apache::lonnet::symbread($url)));
     if ($symb eq '') { $request->print("Unable to handle ambiguous references:$url:."); return ''; }
 
     if (!&canview($usec)) {
 	$request->print('<font color="red">Unable to view requested student.('.
-			$uname.$udom.$usec.$ENV{'request.course.id'}.')</font>');
+			$uname.'@'.$udom.' in section '.$usec.' in course id '.
+			$env{'request.course.id'}.')</font>');
 	$request->print(&show_grading_menu_form($symb,$url));
 	return;
     }
 
-    $ENV{'form.lastSub'} = ($ENV{'form.lastSub'} eq '' ? 'datesub' : $ENV{'form.lastSub'});
-    my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+    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" />';
 
     # header info
     if ($counter == 0) {
 	&sub_page_js($request);
-	&sub_page_kw_js($request) if ($ENV{'form.handgrade'} eq 'yes');
-	$ENV{'form.probTitle'} = $ENV{'form.probTitle'} eq '' ? 
-	    &Apache::lonnet::gettitle($symb) : $ENV{'form.probTitle'};
+	&sub_page_kw_js($request) if ($env{'form.handgrade'} eq 'yes');
+	$env{'form.probTitle'} = $env{'form.probTitle'} eq '' ? 
+	    &Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
 
 	$request->print('<h3>&nbsp;<font color="#339933">Submission Record</font></h3>'."\n".
-			'<font size=+1>&nbsp;<b>Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n");
+			'<font size=+1>&nbsp;<b>Resource: </b>'.$env{'form.probTitle'}.'</font>'."\n");
 
-	if ($ENV{'form.handgrade'} eq 'no') {
+	if ($env{'form.handgrade'} eq 'no') {
 	    my $checkMark='<br /><br />&nbsp;<b>Note:</b> Part(s) graded correct by the computer is marked with a '.
 		$checkIcon.' symbol.'."\n";
 	    $request->print($checkMark);
@@ -1398,13 +1499,13 @@ 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.vAns'} eq 'yes') {
+	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') {
+	    if ($env{'form.vProb'} eq 'yes' && $env{'form.vAns'} eq 'yes') {
 		$mode='both';
-	    } elsif ($ENV{'form.vProb'} eq 'yes') {
+	    } elsif ($env{'form.vProb'} eq 'yes') {
 		$mode='text';
-	    } elsif ($ENV{'form.vAns'} eq 'yes') {
+	    } elsif ($env{'form.vAns'} eq 'yes') {
 		$mode='answer';
 	    }
 	    $request->print(&show_problem($request,$symb,$uname,$udom,0,1,$mode));
@@ -1413,60 +1514,60 @@ sub submission {
 	# kwclr is the only variable that is guaranteed to be non blank 
         # if this subroutine has been called once.
 	my %keyhash = ();
-	if ($ENV{'form.kwclr'} eq '' && $ENV{'form.handgrade'} eq 'yes') {
+	if ($env{'form.kwclr'} eq '' && $env{'form.handgrade'} eq 'yes') {
 	    %keyhash = &Apache::lonnet::dump('nohist_handgrade',
-					     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-					     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+					     $env{'course.'.$env{'request.course.id'}.'.domain'},
+					     $env{'course.'.$env{'request.course.id'}.'.num'});
 
-	    my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
-	    $ENV{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
-	    $ENV{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
-	    $ENV{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
-	    $ENV{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
-	    $ENV{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
-		$keyhash{$symb.'_subject'} : $ENV{'form.probTitle'};
-	    $ENV{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
+	    my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
+	    $env{'form.keywords'} = $keyhash{$symb.'_keywords'} ne '' ? $keyhash{$symb.'_keywords'} : '';
+	    $env{'form.kwclr'}    = $keyhash{$loginuser.'_kwclr'} ne '' ? $keyhash{$loginuser.'_kwclr'} : 'red';
+	    $env{'form.kwsize'}   = $keyhash{$loginuser.'_kwsize'} ne '' ? $keyhash{$loginuser.'_kwsize'} : '0';
+	    $env{'form.kwstyle'}  = $keyhash{$loginuser.'_kwstyle'} ne '' ? $keyhash{$loginuser.'_kwstyle'} : '';
+	    $env{'form.msgsub'}   = $keyhash{$symb.'_subject'} ne '' ? 
+		$keyhash{$symb.'_subject'} : $env{'form.probTitle'};
+	    $env{'form.savemsgN'} = $keyhash{$symb.'_savemsgN'} ne '' ? $keyhash{$symb.'_savemsgN'} : '0';
 	}
-	my $overRideScore = $ENV{'form.overRideScore'} eq '' ? 'no' : $ENV{'form.overRideScore'};
+	my $overRideScore = $env{'form.overRideScore'} eq '' ? 'no' : $env{'form.overRideScore'};
 
 	$request->print('<form action="/adm/grades" method="post" name="SCORE">'."\n".
 			'<input type="hidden" name="command"    value="handgrade" />'."\n".
-			'<input type="hidden" name="saveState"  value="'.$ENV{'form.saveState'}.'" />'."\n".
-			'<input type="hidden" name="Status"     value="'.$ENV{'form.Status'}.'" />'."\n".
+			'<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
+			'<input type="hidden" name="Status"     value="'.$env{'form.Status'}.'" />'."\n".
 			'<input type="hidden" name="overRideScore" value="'.$overRideScore.'" />'."\n".
-			'<input type="hidden" name="probTitle"  value="'.$ENV{'form.probTitle'}.'" />'."\n".
+			'<input type="hidden" name="probTitle"  value="'.$env{'form.probTitle'}.'" />'."\n".
 			'<input type="hidden" name="refresh"    value="off" />'."\n".
 			'<input type="hidden" name="studentNo"  value="" />'."\n".
 			'<input type="hidden" name="gradeOpt"   value="" />'."\n".
 			'<input type="hidden" name="symb"       value="'.$symb.'" />'."\n".
 			'<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".
-			'<input type="hidden" name="handgrade"  value="'.$ENV{'form.handgrade'}.'">'."\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".
+			'<input type="hidden" name="handgrade"  value="'.$env{'form.handgrade'}.'">'."\n".
 			'<input type="hidden" name="NCT"'.
-			' value="'.($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : $total+1).'" />'."\n");
-	if ($ENV{'form.handgrade'} eq 'yes') {
-	    $request->print('<input type="hidden" name="keywords" value="'.$ENV{'form.keywords'}.'" />'."\n".
-			    '<input type="hidden" name="kwclr"    value="'.$ENV{'form.kwclr'}.'" />'."\n".
-			    '<input type="hidden" name="kwsize"   value="'.$ENV{'form.kwsize'}.'" />'."\n".
-			    '<input type="hidden" name="kwstyle"  value="'.$ENV{'form.kwstyle'}.'" />'."\n".
-			    '<input type="hidden" name="msgsub"   value="'.$ENV{'form.msgsub'}.'" />'."\n".
+			' value="'.($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : $total+1).'" />'."\n");
+	if ($env{'form.handgrade'} eq 'yes') {
+	    $request->print('<input type="hidden" name="keywords" value="'.$env{'form.keywords'}.'" />'."\n".
+			    '<input type="hidden" name="kwclr"    value="'.$env{'form.kwclr'}.'" />'."\n".
+			    '<input type="hidden" name="kwsize"   value="'.$env{'form.kwsize'}.'" />'."\n".
+			    '<input type="hidden" name="kwstyle"  value="'.$env{'form.kwstyle'}.'" />'."\n".
+			    '<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");
+			    '<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,'');
-	while ($cts <= $ENV{'form.savemsgN'}) {
+	while ($cts <= $env{'form.savemsgN'}) {
 	    $prnmsg.='<input type="hidden" name="savemsg'.$cts.'" value="'.
 		(!exists($keyhash{$symb.'_savemsg'.$cts}) ? 
-		 &Apache::lonfeedback::clear_out_html($ENV{'form.savemsg'.$cts}) :
+		 &Apache::lonfeedback::clear_out_html($env{'form.savemsg'.$cts}) :
 		 &Apache::lonfeedback::clear_out_html($keyhash{$symb.'_savemsg'.$cts})).
 		'" />'."\n".
 		'<input type="hidden" name="shownOnce'.$cts.'" value="0" />'."\n";
@@ -1474,7 +1575,7 @@ sub submission {
 	}
 	$request->print($prnmsg);
 
-	if ($ENV{'form.handgrade'} eq 'yes' && $ENV{'form.showgrading'} eq 'yes') {
+	if ($env{'form.handgrade'} eq 'yes' && $env{'form.showgrading'} eq 'yes') {
 #
 # Print out the keyword options line
 #
@@ -1496,21 +1597,20 @@ KEYWORDS
         }
     }
 
-    if ($ENV{'form.vProb'} eq 'all' or $ENV{'form.vAns'} eq 'all') {
+    if ($env{'form.vProb'} eq 'all' or $env{'form.vAns'} eq 'all') {
 	$request->print('<br /><br /><br />') if ($counter > 0);
 	my $mode;
-	if ($ENV{'form.vProb'} eq 'all' && $ENV{'form.vAns'} eq 'all') {
+	if ($env{'form.vProb'} eq 'all' && $env{'form.vAns'} eq 'all') {
 	    $mode='both';
-	} elsif ($ENV{'form.vProb'} eq 'all' ) {
+	} elsif ($env{'form.vProb'} eq 'all' ) {
 	    $mode='text';
-	} elsif ($ENV{'form.vAns'} eq 'all') {
+	} 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 %record = &Apache::lonnet::restore($symb,$env{'request.course.id'},$udom,$uname);
     my ($partlist,$handgrade,$responseType) = &response_type($url,$symb);
 
     # Display student info
@@ -1518,14 +1618,14 @@ KEYWORDS
     my $result='<table border="0" width=100%><tr><td bgcolor="#777777">'."\n".
 	'<table border="0" width=100%><tr bgcolor="#edffff"><td>'."\n";
 
-    $result.='<b>Fullname: </b>'.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).'<br />'."\n";
+    $result.='<b>Fullname: </b>'.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).'<br />'."\n";
     $result.='<input type="hidden" name="name'.$counter.
-	'" value="'.$ENV{'form.fullname'}.'" />'."\n";
+	'" value="'.$env{'form.fullname'}.'" />'."\n";
 
     # If any part of the problem is an essay-response (handgraded), then check for collaborators
     my @col_fullnames;
     my ($classlist,$fullname);
-    if ($ENV{'form.handgrade'} eq 'yes') {
+    if ($env{'form.handgrade'} eq 'yes') {
 	($classlist,undef,$fullname) = &getclasslist('all','0');
 	for (keys (%$handgrade)) {
 	    my $ncol = &Apache::lonnet::EXT('resource.'.$_.
@@ -1586,7 +1686,7 @@ KEYWORDS
     #                  (for multi-response type part)
     #             (3) Last submission plus the parts info
     #             (4) The whole record for this student
-    if ($ENV{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
+    if ($env{'form.lastSub'} =~ /^(lastonly|hdgrade)$/) {
 	my ($string,$timestamp)= &get_last_submission(\%record);
 	my $lastsubonly=''.
 	    ($$timestamp eq '' ? '' : '<b>Date Submitted:</b> '.
@@ -1597,22 +1697,23 @@ KEYWORDS
 	    my %seenparts;
 	    for my $part (sort keys(%$handgrade)) {
 		my ($partid,$respid) = split(/_/,$part);
-		if ($ENV{"form.$uname:$udom:$partid:submitted_by"}) {
+		my $display_part=&get_display_part($partid,$url,$symb);
+		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>'.
+		    my $submitby='<b>Part:</b> '.$display_part.
+			' <b>Collaborative submission by:</b> '.
 			'<a href="javascript:viewSubmitter(\''.
-			$ENV{"form.$uname:$udom:$partid:submitted_by"}.
+			$env{"form.$uname:$udom:$partid:submitted_by"}.
 			'\')"; TARGET=_self>'.
-			$$fullname{$ENV{"form.$uname:$udom:$partid:submitted_by"}}.'</a><br />';
+			$$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.
+		    $lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+			$display_part.' <font color="#999999">( ID '.$respid.
 			' )</font>&nbsp; &nbsp;'.
 			'<font color="red">Nothing submitted - no attempts</font><br /><br />';
 		    next;
@@ -1623,7 +1724,7 @@ KEYWORDS
 		    my ($ressub,$subval) = split(/:/,$_,2);
 		    # Similarity check
 		    my $similar='';
-		    if($ENV{'form.checkPlag'}){
+		    if($env{'form.checkPlag'}){
 			my ($oname,$odom,$ocrsid,$oessay,$osim)=
 			    &most_similar($uname,$udom,$subval);
 			if ($osim) {
@@ -1637,14 +1738,33 @@ KEYWORDS
 			}
 		    }
 		    my $order=&get_order($partid,$respid,$symb,$uname,$udom);
-		    if ($ENV{'form.lastSub'} eq 'lastonly' || 
-			($ENV{'form.lastSub'} eq 'hdgrade' && 
+		    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.
+			my $display_part=&get_display_part($partid,$url,$symb);
+			$lastsubonly.='<tr><td bgcolor="#ffffe6"><b>Part:</b> '.
+			    $display_part.' <font color="#999999">( ID '.$respid.
 			    ' )</font>&nbsp; &nbsp;';
+			my @files;
+			if ($record{"resource.$partid.$respid.portfiles"}) {
+			    my $file_url = '/uploaded/'.$udom.'/'.$uname.'/portfolio';
+			    foreach my $file (split(',',$record{"resource.$partid.$respid.portfiles"})) {
+				push(@files,$file_url.$file);
+			    
+				&Apache::lonnet::logthis("found a portfolio file".$record{"resource.$partid.$respid.portfiles"});
+				&Apache::lonnet::logthis("uploaded URL file".$record{"resource.$partid.$respid.uploadedurl"});
+			    }
+			}
 			if ($record{"resource.$partid.$respid.uploadedurl"}) {
-			    $lastsubonly.='<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 />';
+			    push(@files,$record{"resource.$partid.$respid.uploadedurl"});
+			}
+			if (@files) {
+			    $lastsubonly.='<br /><font color="red" size="1">Like all files provided by users, this file may contain virusses</font><br />';
+			    foreach my $file (@files) {
+				&Apache::lonnet::allowuploaded('/adm/grades',$file);
+				$lastsubonly.='<br /><a href="'.$file.'" target="lonGRDs"><img src="'.&Apache::loncommon::icon($file).'" border=0"> '.$file.'</a>';
+			    }
+			    $lastsubonly.='<br />';
 			}
 			$lastsubonly.='<b>Submitted Answer: </b>'.
 			    &cleanRecord($subval,$responsetype,$symb,$partid,
@@ -1656,12 +1776,12 @@ KEYWORDS
 	}
 	$lastsubonly.='</td></tr><tr bgcolor="#ffffff"><td>'."\n";
 	$request->print($lastsubonly);
-    } elsif ($ENV{'form.lastSub'} eq 'datesub') {
+    } elsif ($env{'form.lastSub'} eq 'datesub') {
 	my (undef,$responseType,undef,$parts) = &showResourceInfo($url);
 	$request->print(&displaySubByDates($symb,\%record,$parts,$responseType,$checkIcon,$uname,$udom));
-    } elsif ($ENV{'form.lastSub'} =~ /^(last|all)$/) {
+    } elsif ($env{'form.lastSub'} =~ /^(last|all)$/) {
 	$request->print(&Apache::loncommon::get_previous_attempt($symb,$uname,$udom,
-								 $ENV{'request.course.id'},
+								 $env{'request.course.id'},
 								 $last,'.submission',
 								 'Apache::grades::keywords_highlight'));
     }
@@ -1670,21 +1790,24 @@ KEYWORDS
 	.$udom.'" />'."\n");
     
     # return if view submission with no grading option
-    if ($ENV{'form.showgrading'} eq '' || (!&canmodify($usec))) {
+    if ($env{'form.showgrading'} eq '' || (!&canmodify($usec))) {
 	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));
-	$request = print($toGrade);
+	$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;
+    } else {
+	$request->print('</td></tr></table></td></tr></table>'."\n");
     }
 
     # essay grading message center
-    if ($ENV{'form.handgrade'} eq 'yes') {
-	my ($lastname,$givenn) = split(/,/,$ENV{'form.fullname'});
+    if ($env{'form.handgrade'} eq 'yes') {
+	my ($lastname,$givenn) = split(/,/,$env{'form.fullname'});
 	my $msgfor = $givenn.' '.$lastname;
 	if (scalar(@col_fullnames) > 0) {
 	    my $lastone = pop @col_fullnames;
@@ -1699,7 +1822,7 @@ KEYWORDS
 	    '<img src="'.$request->dir_config('lonIconsURL').
 	    '/mailbkgrd.gif" width="14" height="10" name="mailicon'.$counter.'" />'."\n".
 	    '<br />&nbsp;(Message will be sent when you click on Save & Next below.)'."\n" 
-	    if ($ENV{'form.handgrade'} eq 'yes');
+	    if ($env{'form.handgrade'} eq 'yes');
 	$request->print($result);
     }
 
@@ -1710,7 +1833,7 @@ KEYWORDS
 	my ($partid,$respid) = split(/_/);
 	next if ($seen{$partid} > 0);
 	$seen{$partid}++;
-	next if ($$handgrade{$_} =~ /:no$/ && $ENV{'form.lastSub'} =~ /^(hdgrade)$/);
+	next if ($$handgrade{$_} =~ /:no$/ && $env{'form.lastSub'} =~ /^(hdgrade)$/);
 	push @partlist,$partid;
 	push @gradePartRespid,$partid.'.'.$respid;
 
@@ -1738,7 +1861,7 @@ KEYWORDS
 	    '<option>1</option><option>2</option>'.
 	    '<option>3</option><option>5</option>'.
 	    '<option>7</option><option>10</option></select>'."\n";
-	my $nsel = ($ENV{'form.NTSTU'} ne '' ? $ENV{'form.NTSTU'} : '1');
+	my $nsel = ($env{'form.NTSTU'} ne '' ? $env{'form.NTSTU'} : '1');
 	$ntstu =~ s/<option>$nsel</<option selected="on">$nsel</;
 	$endform.=$ntstu.'student(s) &nbsp;&nbsp;';
 	$endform.='<input type="button" value="Previous" '.
@@ -1782,12 +1905,12 @@ sub get_last_submission {
 #--- High light keywords, with style choosen by user.
 sub keywords_highlight {
     my $string    = shift;
-    my $size      = $ENV{'form.kwsize'} eq '0' ? '' : 'size='.$ENV{'form.kwsize'};
-    my $styleon   = $ENV{'form.kwstyle'} eq ''  ? '' : $ENV{'form.kwstyle'};
+    my $size      = $env{'form.kwsize'} eq '0' ? '' : 'size='.$env{'form.kwsize'};
+    my $styleon   = $env{'form.kwstyle'} eq ''  ? '' : $env{'form.kwstyle'};
     (my $styleoff = $styleon) =~ s/\</\<\//;
-    my @keylist   = split(/[,\s+]/,$ENV{'form.keywords'});
+    my @keylist   = split(/[,\s+]/,$env{'form.keywords'});
     foreach (@keylist) {
-	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$ENV{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
+	$string =~ s/\b\Q$_\E(\b|\.)/<font color\=$env{'form.kwclr'} $size\>$styleon$_$styleoff<\/font>/gi;
     }
     return $string;
 }
@@ -1795,15 +1918,15 @@ sub keywords_highlight {
 #--- Called from submission routine
 sub processHandGrade {
     my ($request) = shift;
-    my $url    = $ENV{'form.url'};
-    my $symb   = $ENV{'form.symb'};
-    my $button = $ENV{'form.gradeOpt'};
-    my $ngrade = $ENV{'form.NCT'};
-    my $ntstu  = $ENV{'form.NTSTU'};
+    my $url    = $env{'form.url'};
+    my $symb   = $env{'form.symb'};
+    my $button = $env{'form.gradeOpt'};
+    my $ngrade = $env{'form.NCT'};
+    my $ntstu  = $env{'form.NTSTU'};
     if ($button eq 'Save & Next') {
 	my $ctr = 0;
 	while ($ctr < $ngrade) {
-	    my ($uname,$udom) = split(/:/,$ENV{'form.unamedom'.$ctr});
+	    my ($uname,$udom) = split(/:/,$env{'form.unamedom'.$ctr});
 	    my ($errorflag,$pts,$wgt) = &saveHandGrade($request,$url,$symb,$uname,$udom,$ctr);
 	    if ($errorflag eq 'no_score') {
 		$ctr++;
@@ -1814,36 +1937,36 @@ sub processHandGrade {
 		$ctr++;
 		next;
 	    }
-	    my $includemsg = $ENV{'form.includemsg'.$ctr};
+	    my $includemsg = $env{'form.includemsg'.$ctr};
 	    my ($subject,$message,$msgstatus) = ('','','');
 	    if ($includemsg =~ /savemsg|newmsg\Q$ctr\E/) {
-		$subject = $ENV{'form.msgsub'} if ($includemsg =~ /^msgsub/);
+		$subject = $env{'form.msgsub'} if ($includemsg =~ /^msgsub/);
 		my (@msgnum) = split(/,/,$includemsg);
 		foreach (@msgnum) {
-		    $message.=$ENV{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
+		    $message.=$env{'form.'.$_} if ($_ =~ /savemsg|newmsg/ && $_ ne '');
 		}
 		$message =&Apache::lonfeedback::clear_out_html($message);
 		$message.="\n\nPoint".($pts > 1 ? 's':'').' awarded = '.$pts.' out of '.$wgt;
 		$message.=" for <a href=\"".
 		    &Apache::lonnet::clutter($url).
-		    "?symb=$symb\">$ENV{'form.probTitle'}</a>";
+		    "?symb=$symb\">$env{'form.probTitle'}</a>";
 		$msgstatus = &Apache::lonmsg::user_normal_msg ($uname,$udom,
-							       $ENV{'form.msgsub'},$message);
+							       $env{'form.msgsub'},$message);
 	    }
-	    if ($ENV{'form.collaborator'.$ctr}) {
+	    if ($env{'form.collaborator'.$ctr}) {
 		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);
+					   $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);
+				$msgstatus = &Apache::lonmsg::user_normal_msg($_,$udom,$env{'form.msgsub'},$message);
 			    }
 			    
 			}
@@ -1854,61 +1977,61 @@ sub processHandGrade {
 	}
     }
 
-    if ($ENV{'form.handgrade'} eq 'yes') {
+    if ($env{'form.handgrade'} eq 'yes') {
 	# Keywords sorted in alphabatical order
-	my $loginuser = $ENV{'user.name'}.':'.$ENV{'user.domain'};
+	my $loginuser = $env{'user.name'}.':'.$env{'user.domain'};
 	my %keyhash = ();
-	$ENV{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
-	$ENV{'form.keywords'}           =~ s/^\s+|\s+$//;
-	my (@keywords) = sort(split(/\s+/,$ENV{'form.keywords'}));
-	$ENV{'form.keywords'} = join(' ',@keywords);
-	$keyhash{$symb.'_keywords'}     = $ENV{'form.keywords'};
-	$keyhash{$symb.'_subject'}      = $ENV{'form.msgsub'};
-	$keyhash{$loginuser.'_kwclr'}   = $ENV{'form.kwclr'};
-	$keyhash{$loginuser.'_kwsize'}  = $ENV{'form.kwsize'};
-	$keyhash{$loginuser.'_kwstyle'} = $ENV{'form.kwstyle'};
+	$env{'form.keywords'}           =~ s/,\s{0,}|\s+/ /g;
+	$env{'form.keywords'}           =~ s/^\s+|\s+$//;
+	my (@keywords) = sort(split(/\s+/,$env{'form.keywords'}));
+	$env{'form.keywords'} = join(' ',@keywords);
+	$keyhash{$symb.'_keywords'}     = $env{'form.keywords'};
+	$keyhash{$symb.'_subject'}      = $env{'form.msgsub'};
+	$keyhash{$loginuser.'_kwclr'}   = $env{'form.kwclr'};
+	$keyhash{$loginuser.'_kwsize'}  = $env{'form.kwsize'};
+	$keyhash{$loginuser.'_kwstyle'} = $env{'form.kwstyle'};
 
 	# message center - Order of message gets changed. Blank line is eliminated.
-	# New messages are saved in ENV for the next student.
+	# New messages are saved in env for the next student.
 	# All messages are saved in nohist_handgrade.db
 	my ($ctr,$idx) = (1,1);
-	while ($ctr <= $ENV{'form.savemsgN'}) {
-	    if ($ENV{'form.savemsg'.$ctr} ne '') {
-		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.savemsg'.$ctr};
+	while ($ctr <= $env{'form.savemsgN'}) {
+	    if ($env{'form.savemsg'.$ctr} ne '') {
+		$keyhash{$symb.'_savemsg'.$idx} = $env{'form.savemsg'.$ctr};
 		$idx++;
 	    }
 	    $ctr++;
 	}
 	$ctr = 0;
 	while ($ctr < $ngrade) {
-	    if ($ENV{'form.newmsg'.$ctr} ne '') {
-		$keyhash{$symb.'_savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
-		$ENV{'form.savemsg'.$idx} = $ENV{'form.newmsg'.$ctr};
+	    if ($env{'form.newmsg'.$ctr} ne '') {
+		$keyhash{$symb.'_savemsg'.$idx} = $env{'form.newmsg'.$ctr};
+		$env{'form.savemsg'.$idx} = $env{'form.newmsg'.$ctr};
 		$idx++;
 	    }
 	    $ctr++;
 	}
-	$ENV{'form.savemsgN'} = --$idx;
-	$keyhash{$symb.'_savemsgN'} = $ENV{'form.savemsgN'};
+	$env{'form.savemsgN'} = --$idx;
+	$keyhash{$symb.'_savemsgN'} = $env{'form.savemsgN'};
 	my $putresult = &Apache::lonnet::put
 	    ('nohist_handgrade',\%keyhash,
-	     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-	     $ENV{'course.'.$ENV{'request.course.id'}.'.num'});
+	     $env{'course.'.$env{'request.course.id'}.'.domain'},
+	     $env{'course.'.$env{'request.course.id'}.'.num'});
     }
     # Called by Save & Refresh from Highlight Attribute Window
-    my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
-    if ($ENV{'form.refresh'} eq 'on') {
+    my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
+    if ($env{'form.refresh'} eq 'on') {
 	my ($ctr,$total) = (0,0);
 	while ($ctr < $ngrade) {
-	    $total++ if  $ENV{'form.unamedom'.$ctr} ne '';
+	    $total++ if  $env{'form.unamedom'.$ctr} ne '';
 	    $ctr++;
 	}
-	$ENV{'form.NTSTU'}=$ngrade;
+	$env{'form.NTSTU'}=$ngrade;
 	$ctr = 0;
 	while ($ctr < $total) {
-	    my $processUser = $ENV{'form.unamedom'.$ctr};
-	    ($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
-	    $ENV{'form.fullname'} = $$fullname{$processUser};
+	    my $processUser = $env{'form.unamedom'.$ctr};
+	    ($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
+	    $env{'form.fullname'} = $$fullname{$processUser};
 	    &submission($request,$ctr,$total-1);
 	    $ctr++;
 	}
@@ -1917,20 +2040,20 @@ sub processHandGrade {
 
 # Go directly to grade student - from submission or link from chart page
     if ($button eq 'Grade Student') {
-	(undef,undef,$ENV{'form.handgrade'},undef,undef) = &showResourceInfo($url);
-	my $processUser = $ENV{'form.unamedom'.$ENV{'form.studentNo'}};
-	($ENV{'form.student'},$ENV{'form.userdom'}) = split(/:/,$processUser);
-	$ENV{'form.fullname'} = $$fullname{$processUser};
+	(undef,undef,$env{'form.handgrade'},undef,undef) = &showResourceInfo($url);
+	my $processUser = $env{'form.unamedom'.$env{'form.studentNo'}};
+	($env{'form.student'},$env{'form.userdom'}) = split(/:/,$processUser);
+	$env{'form.fullname'} = $$fullname{$processUser};
 	&submission($request,0,0);
 	return '';
     }
 
     # Get the next/previous one or group of students
-    my $firststu = $ENV{'form.unamedom0'};
-    my $laststu = $ENV{'form.unamedom'.($ngrade-1)};
+    my $firststu = $env{'form.unamedom0'};
+    my $laststu = $env{'form.unamedom'.($ngrade-1)};
     my $ctr = 2;
     while ($laststu eq '') {
-	$laststu  = $ENV{'form.unamedom'.($ngrade-$ctr)};
+	$laststu  = $env{'form.unamedom'.($ngrade-$ctr)};
 	$ctr++;
 	$laststu = $firststu if ($ctr > $ngrade);
     }
@@ -1951,16 +2074,18 @@ sub processHandGrade {
     @parsedlist = reverse @parsedlist if ($button eq 'Previous');
     my ($partlist) = &response_type($url);
     foreach my $student (@parsedlist) {
-	my $submitonly=$ENV{'form.submitonly'};
+	my $submitonly=$env{'form.submitonly'};
 	my ($uname,$udom) = split(/:/,$student);
 	if ($submitonly =~ /^(yes|graded|incorrect)$/) {
-#	    my %record = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$udom,$uname);
+#	    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;
+	    my $ungraded = 0;
+	    my $incorrect = 0;
 	    foreach (keys(%status)) {
 		$submitted = 1 if ($status{$_} ne 'nothing');
-		$graded = 0 if ($status{$_} =~ /^correct/);
+		$ungraded = 1 if ($status{$_} =~ /^ungraded/);
+		$incorrect = 1 if ($status{$_} =~ /^incorrect/);
 		my ($foo,$partid,$foo1) = split(/\./,$_);
 		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
 		    $submitted = 0;
@@ -1969,8 +2094,8 @@ sub processHandGrade {
 	    next if (!$submitted && ($submitonly eq 'yes' ||
 				     $submitonly eq 'incorrect' ||
 				     $submitonly eq 'graded'));
-	    next if (!$graded && ($submitonly eq 'graded' ||
-				  $submitonly eq 'incorrect'));
+	    next if (!$ungraded && ($submitonly eq 'graded'));
+	    next if (!$incorrect && $submitonly eq 'incorrect');
 	}
 	push @nextlist,$student if ($ctr < $ntstu);
 	last if ($ctr == $ntstu);
@@ -1982,9 +2107,9 @@ sub processHandGrade {
 
     foreach (sort @nextlist) {
 	my ($uname,$udom,$submitter) = split(/:/);
-	$ENV{'form.student'}  = $uname;
-	$ENV{'form.userdom'}  = $udom;
-	$ENV{'form.fullname'} = $$fullname{$_};
+	$env{'form.student'}  = $uname;
+	$env{'form.userdom'}  = $udom;
+	$env{'form.fullname'} = $$fullname{$_};
 	&submission($request,$ctr,$total);
 	$ctr++;
     }
@@ -2001,49 +2126,70 @@ sub processHandGrade {
 #---- Save the score and award for each student, if changed
 sub saveHandGrade {
     my ($request,$url,$symb,$stuname,$domain,$newflg,$submitter,$part) = @_;
+    my @v_flag;
     my $usec = &Apache::lonnet::getsection($domain,$stuname,
-					   $ENV{'request.course.id'});
+					   $env{'request.course.id'});
     if (!&canmodify($usec)) { return('not_allowed'); }
-    my %record     = &Apache::lonnet::restore($symb,$ENV{'request.course.id'},$domain,$stuname);
+    my %record     = &Apache::lonnet::restore($symb,$env{'request.course.id'},$domain,$stuname);
+    my @parts_graded;
     my %newrecord  = ();
     my ($pts,$wgt) = ('','');
-    foreach (split(/:/,$ENV{'form.partlist'.$newflg})) {
+    my %aggregate = ();
+    my $aggregateflag = 0;
+    foreach my $new_part (split(/:/,$env{'form.partlist'.$newflg})) {
 	#collaborator may vary for different parts
-	if ($submitter && $_ ne $part) { next; }
-	my $dropMenu = $ENV{'form.GD_SEL'.$newflg.'_'.$_};
+	if ($submitter && $new_part ne $part) { next; }
+	my $dropMenu = $env{'form.GD_SEL'.$newflg.'_'.$new_part};
 	if ($dropMenu eq 'excused') {
-	    if ($record{'resource.'.$_.'.solved'} ne 'excused') {
-		$newrecord{'resource.'.$_.'.solved'} = 'excused';
-		if (exists($record{'resource.'.$_.'.awarded'})) {
-		    $newrecord{'resource.'.$_.'.awarded'} = '';
+	    if ($record{'resource.'.$new_part.'.solved'} ne 'excused') {
+		$newrecord{'resource.'.$new_part.'.solved'} = 'excused';
+		if (exists($record{'resource.'.$new_part.'.awarded'})) {
+		    $newrecord{'resource.'.$new_part.'.awarded'} = '';
 		}
-	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+	    $newrecord{'resource.'.$new_part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
 	    }
 	} elsif ($dropMenu eq 'reset status'
-		 && exists($record{'resource.'.$_.'.solved'})) { #don't bother if no old records -> no attempts
-	    $newrecord{'resource.'.$_.'.tries'} = 0;
-	    $newrecord{'resource.'.$_.'.solved'} = '';
-	    $newrecord{'resource.'.$_.'.award'} = '';
-	    $newrecord{'resource.'.$_.'.awarded'} = 0;
-	    $newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+		 && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
+	    foreach my $key (keys (%record)) {
+		if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
+	    }
+	    $newrecord{'resource.'.$new_part.'.regrader'}=
+		"$env{'user.name'}:$env{'user.domain'}";
+            my $totaltries = $record{'resource.'.$part.'.tries'};
+
+            my %last_resets = &get_last_resets($symb,$env{'request.course.id'},
+					       [$new_part]);
+            my $aggtries =$totaltries;
+            if ($last_resets{$new_part}) {
+                $aggtries = &get_num_tries(\%record,$last_resets{$new_part},
+					   $new_part);
+            }
+
+            my $solvedstatus = $record{'resource.'.$new_part.'.solved'};
+            if ($aggtries > 0) {
+                &decrement($symb,$new_part,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                $aggregateflag = 1;
+            }
 	} elsif ($dropMenu eq '') {
-	    $pts = ($ENV{'form.GD_BOX'.$newflg.'_'.$_} ne '' ? 
-		    $ENV{'form.GD_BOX'.$newflg.'_'.$_} : 
-		    $ENV{'form.RADVAL'.$newflg.'_'.$_});
-	    if ($pts eq '' && $ENV{'form.GD_SEL'.$newflg.'_'.$_} eq '') {
+	    $pts = ($env{'form.GD_BOX'.$newflg.'_'.$new_part} ne '' ? 
+		    $env{'form.GD_BOX'.$newflg.'_'.$new_part} : 
+		    $env{'form.RADVAL'.$newflg.'_'.$new_part});
+	    if ($pts eq '' && $env{'form.GD_SEL'.$newflg.'_'.$new_part} eq '') {
 		next;
 	    }
-	    $wgt = $ENV{'form.WGT'.$newflg.'_'.$_} eq '' ? 1 : 
-		$ENV{'form.WGT'.$newflg.'_'.$_};
+	    $wgt = $env{'form.WGT'.$newflg.'_'.$new_part} eq '' ? 1 : 
+		$env{'form.WGT'.$newflg.'_'.$new_part};
 	    my $partial= $pts/$wgt;
-	    if ($partial eq $record{'resource.'.$_.'.awarded'}) {
+	    if ($partial eq $record{'resource.'.$new_part.'.awarded'}) {
 		#do not update score for part if not changed.
 		next;
+	    } else {
+	        push @parts_graded, $new_part;
 	    }
-	    if ($record{'resource.'.$_.'.awarded'} ne $partial) {
-		$newrecord{'resource.'.$_.'.awarded'}  = $partial;
+	    if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
+		$newrecord{'resource.'.$new_part.'.awarded'}  = $partial;
 	    }
-	    my $reckey = 'resource.'.$_.'.solved';
+	    my $reckey = 'resource.'.$new_part.'.solved';
 	    if ($partial == 0) {
 		if ($record{$reckey} ne 'incorrect_by_override') {
 		    $newrecord{$reckey} = 'incorrect_by_override';
@@ -2054,20 +2200,146 @@ sub saveHandGrade {
 		}
 	    }	    
 	    if ($submitter && 
-		($record{'resource.'.$_.'.submitted_by'} ne $submitter)) {
-		$newrecord{'resource.'.$_.'.submitted_by'} = $submitter;
+		($record{'resource.'.$new_part.'.submitted_by'} ne $submitter)) {
+		$newrecord{'resource.'.$new_part.'.submitted_by'} = $submitter;
 	    }
-	    $newrecord{'resource.'.$_.'.regrader'}=
-		"$ENV{'user.name'}:$ENV{'user.domain'}";
+	    $newrecord{'resource.'.$new_part.'.regrader'}=
+		"$env{'user.name'}:$env{'user.domain'}";
+	}
+	# unless problem has been graded, set flag to version the submitted files
+	unless ($record{'resource.'.$new_part.'.solved'} =~ /^correct_/  || $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override') {
+	    push (@v_flag,$new_part);
 	}
     }
     if (scalar(keys(%newrecord)) > 0) {
+        if (scalar(@v_flag)) {
+            &version_portfiles(\%record, \@parts_graded, $env{'request.course.id'}, $symb, $domain, $stuname, \@v_flag);
+        }
 	&Apache::lonnet::cstore(\%newrecord,$symb,
-				$ENV{'request.course.id'},$domain,$stuname);
+				$env{'request.course.id'},$domain,$stuname);
+    }
+    if ($aggregateflag) {
+        &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                  $env{'course.'.$env{'request.course.id'}.'.domain'},
+                  $env{'course.'.$env{'request.course.id'}.'.num'});
     }
     return '',$pts,$wgt;
 }
 
+# ----------- Provides number of tries since last reset.
+sub get_num_tries {
+    my ($record,$last_reset,$part) = @_;
+    my $timestamp = '';
+    my $num_tries = 0;
+    if ($$record{'version'}) {
+        for (my $version=$$record{'version'};$version>=1;$version--) {
+            if (exists($$record{$version.':resource.'.$part.'.solved'})) {
+                $timestamp = $$record{$version.':timestamp'};
+                if ($timestamp > $last_reset) {
+                    $num_tries ++;
+                } else {
+                    last;
+                }
+            }
+        }
+    }
+    return $num_tries;
+}
+
+# ----------- Determine decrements required in aggregate totals 
+sub decrement_aggs {
+    my ($symb,$part,$aggregate,$aggtries,$totaltries,$solvedstatus) = @_;
+    my %decrement = (
+                        attempts => 0,
+                        users => 0,
+                        correct => 0
+                    );
+    $decrement{'attempts'} = $aggtries;
+    if ($solvedstatus =~ /^correct/) {
+        $decrement{'correct'} = 1;
+    }
+    if ($aggtries == $totaltries) {
+        $decrement{'users'} = 1;
+    }
+    foreach my $type (keys (%decrement)) {
+        $$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
+    }
+    return;
+}
+
+# ----------- Determine timestamps for last reset of aggregate totals for parts  
+sub get_last_resets {
+    my ($symb,$courseid,$partids) =@_;
+    my %last_resets;
+    my $cdom = $env{'course.'.$courseid.'.domain'};
+    my $cname = $env{'course.'.$courseid.'.num'};
+    my @keys;
+    foreach my $part (@{$partids}) {
+	push(@keys,"$symb\0$part\0resettime");
+    }
+    my %results=&Apache::lonnet::get('nohist_resourcetracker',\@keys,
+				     $cdom,$cname);
+    foreach my $part (@{$partids}) {
+	$last_resets{$part}=$results{"$symb\0$part\0resettime"};
+    }
+    return %last_resets;
+}
+
+# ----------- Handles creating versions for portfolio files as answers
+sub version_portfiles {
+    my ($record, $parts_graded, $courseid, $symb, $domain, $stuname, $v_flag) = @_;
+    my $version_parts = join('|',@$v_flag);
+    my $parts = join('|', @$parts_graded);
+    my $portfolio_root = &Apache::loncommon::propath($domain,
+						 $stuname).
+						'/userfiles/portfolio';
+    foreach my $key (keys(%$record)) {
+        my $new_portfiles;
+        if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
+            my @v_portfiles;
+            my @portfiles = split(/,/,$$record{$key});
+            # &Apache::lonnet::logthis("should be unmarking and remarking");
+            foreach my $file (@portfiles) {
+                &Apache::lonnet::unmark_as_readonly($domain,$stuname,[$symb,$env{'request.course.id'}],$file);
+                my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*$)/);
+                my $version = 0;
+                my @answer_file_parts = split(/\./, $answer_file);
+                my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stuname,$portfolio_root);
+                my @file_names;
+                my @file_name_parts;
+                foreach my $row (@dir_list) {
+                    @file_names = split(/\&/,$row,2);
+                    @file_name_parts = split(/\./, $file_names[0]);
+                    # ($file_name_parts[scalar @file_name_parts] eq $answer_file_parts[scalar @answer_file_parts])
+                    if (($file_name_parts[0] eq $answer_file_parts[0]) && 
+                        ($file_name_parts[-1] eq $answer_file_parts[-1])) {
+                        # gets here if filename and extension match, regardless of version
+                        if (scalar @file_name_parts == 3) { # a versioned file is found
+                            # so save it for later
+                            if ($file_name_parts[1] > $version) {$version = $file_name_parts[1]};
+                        }
+                    }
+                }
+                $version++;
+                $env{'form.copy'} = &Apache::lonnet::getfile("/uploaded/$domain/$stuname/portfolio$directory$answer_file");
+                if($env{'form.copy'} eq '-1') {
+                    &Apache::lonnet::logthis('problem getting file '.$directory.$answer_file);
+                } else {
+                   my $copy_result = &Apache::lonnet::finishuserfileupload($stuname,$domain,'copy',
+                                    '/portfolio'.$directory.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);
+                    push(@v_portfiles, $answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]);
+                    &Apache::lonnet::mark_as_readonly($domain,$stuname,
+                                ['/portfolio'.$directory.$answer_file_parts[0].'.'.$version.'.'.$answer_file_parts[-1]],
+                                [$symb,$env{'request.course.id'},'graded']);
+                }
+            }
+            $$record{$key} = join(',',@v_portfiles);
+        }
+    } 
+    return 'ok';   
+    
+}
+
 #--------------------------------------------------------------------------------------
 #
 #-------------------------- Next few routines handles grading by section or whole class
@@ -2133,6 +2405,7 @@ sub viewgrades_js {
     function writeRadText(partid,weight) {
 	var selval   = document.classgrade["SELVAL_"+partid];
 	var radioButton = document.classgrade["RADVAL_"+partid];
+        var override = document.classgrade["FORCE_"+partid].checked;
 	var textbox = document.classgrade["TEXTVAL_"+partid];
 	if (selval[1].selected || selval[2].selected) {
 	    for (var i=0; i<radioButton.length; i++) {
@@ -2146,7 +2419,7 @@ sub viewgrades_js {
 		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
 		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
-		if (saveval != "correct") {
+		if ((saveval != "correct") || override) {
 		    scorename.value = "";
 		    if (selval[1].selected) {
 			selname[1].selected = true;
@@ -2163,7 +2436,7 @@ sub viewgrades_js {
 		var scorename = document.classgrade["GD_"+user+"_"+partid+"_awarded"];
 		var saveval   = document.classgrade["GD_"+user+"_"+partid+"_solved_s"].value;
 		var selname   = document.classgrade["GD_"+user+"_"+partid+"_solved"];
-		if (saveval != "correct") {
+		if ((saveval != "correct") || override) {
 		    scorename.value = document.classgrade["GD_"+user+"_"+partid+"_awarded_s"].value;
 		    selname[0].selected = true;
 		}
@@ -2200,7 +2473,7 @@ sub viewgrades_js {
 	    if (selval[2].selected) {
 		document.classgrade["GD_"+user+'_'+partid+"_tries"].value = "0";
 	    }
-	}
+        }
     }
 
     function resetEntry(numpart) {
@@ -2242,10 +2515,16 @@ sub viewgrades {
     my ($request) = shift;
     &viewgrades_js($request);
 
-    my ($symb,$url) = ($ENV{'form.symb'},$ENV{'form.url'}); 
-    my $result='<h3><font color="#339933">Manual Grading</font></h3>';
+    my ($symb,$url) = ($env{'form.symb'},$env{'form.url'}); 
+    #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();
 
-    $result.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font>'."\n";
+    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
     $result.=&jscriptNform($url,$symb);
@@ -2255,18 +2534,18 @@ sub viewgrades {
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
 	'<input type="hidden" name="command" value="editgrades" />'."\n".
-	'<input type="hidden" name="section" value="'.$ENV{'form.section'}.'" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
-	'<input type="hidden" name="Status" value="'.$ENV{'form.Status'}.'" />'."\n".
-	'<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+	'<input type="hidden" name="section" value="'.$env{'form.section'}.'" />'."\n".
+	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="Status" value="'.$env{'form.Status'}.'" />'."\n".
+	'<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
 
     my $sectionClass;
-    if ($ENV{'form.section'} eq 'all') {
+    if ($env{'form.section'} eq 'all') {
 	$sectionClass='Class </h3>';
-    } elsif ($ENV{'form.section'} eq 'no') {
+    } elsif ($env{'form.section'} eq 'none') {
 	$sectionClass='Students in no Section </h3>';
     } else {
-	$sectionClass='Students in Section '.$ENV{'form.section'}.'</h3>';
+	$sectionClass='Students in Section '.$env{'form.section'}.'</h3>';
     }
     $result.='<h3>Assign Common Grade To '.$sectionClass;
     $result.= '<table border=0><tr><td bgcolor="#777777">'."\n".
@@ -2290,7 +2569,8 @@ sub viewgrades {
 	    $ctsparts.'" value="'.$partid.'" />'."\n";
 	$result.='<input type="hidden" name="weight_'.
 	    $partid.'" value="'.$weight{$partid}.'" />'."\n";
-	$result.='<tr><td><b>Part  '.$partid.'&nbsp; &nbsp;Point:</b> </td><td>';
+	my $display_part=&get_display_part($partid,$url,$symb);
+	$result.='<tr><td><b>Part:</b> '.$display_part.'&nbsp; &nbsp;<b>Point:</b> </td><td>';
 	$result.='<table border="0"><tr>';  
 	my $ctr = 0;
 	while ($ctr<=$weight{$partid}) { # display radio buttons in a nice table 10 across
@@ -2310,7 +2590,8 @@ sub viewgrades {
 		$weight{$partid}.')"> '.
 	    '<option selected="on"> </option>'.
 	    '<option>excused</option>'.
-	    '<option>reset status</option></select></td></tr>'."\n";
+	    '<option>reset status</option></select></td>'.
+            '<td><label><input type="checkbox" name="FORCE_'.$partid.'" /> Override "Correct"</label></td></tr>'."\n";
 	$ctsparts++;
     }
     $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
@@ -2325,32 +2606,37 @@ sub viewgrades {
 	'<table border=0><tr bgcolor="#deffff"><td>&nbsp;<b>No.</b>&nbsp;</td>'.
 	'<td>'.&nameUserString('header')."</td>\n";
     my (@parts) = sort(&getpartlist($url,$symb));
+    my @partids = ();
     foreach my $part (@parts) {
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
 	$display =~ s|^Number of Attempts|Tries<br />|; # makes the column narrower
 	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
+	my ($partid) = &split_part_type($part);
+        push(@partids, $partid);
+	my $display_part=&get_display_part($partid,$url,$symb);
 	if ($display =~ /^Partial Credit Factor/) {
-	    my ($partid) = &split_part_type($part);
-	    $result.='<td><b>Score Part '.$partid.'<br />(weight = '.
-		$weight{$partid}.')</b></td>'."\n";
+	    $result.='<td><b>Score Part:</b> '.$display_part.
+		' <br /><b>(weight = '.$weight{$partid}.')</b></td>'."\n";
 	    next;
+	} else {
+	    $display =~s/\[Part: \Q$partid\E\]/Part:<\/b> $display_part/;
 	}
 	$display =~ s|Problem Status|Grade Status<br />|;
-	$result.='<td><b>'.$display.'</b></td>'."\n";
+	$result.='<td><b>'.$display.'</td>'."\n";
     }
     $result.='</tr>';
 
+    my %last_resets = 
+	&get_last_resets($symb,$env{'request.course.id'},\@partids);
+
     #get info for each student
     #list all the students - with points and grade status
-    my (undef,undef,$fullname) = &getclasslist($ENV{'form.section'},'1');
+    my (undef,undef,$fullname) = &getclasslist($env{'form.section'},'1');
     my $ctr = 0;
     foreach (sort {lc($$fullname{$a}) cmp lc($$fullname{$b}) } keys %$fullname) {
-	my $uname = $_;
-	$uname=~s/:/_/;
-	$result.='<input type="hidden" name="ctr'.$ctr.'" value="'.$uname.'" />'."\n";
 	$ctr++;
-	$result.=&viewstudentgrade($url,$symb,$ENV{'request.course.id'},
-				   $_,$$fullname{$_},\@parts,\%weight,$ctr);
+	$result.=&viewstudentgrade($url,$symb,$env{'request.course.id'},
+				   $_,$$fullname{$_},\@parts,\%weight,$ctr,\%last_resets);
     }
     $result.='</table></td></tr></table>';
     $result.='<input type="hidden" name="total" value="'.$ctr.'" />'."\n";
@@ -2358,8 +2644,8 @@ sub viewgrades {
 	'onClick="javascript:submit();" TARGET=_self /></form>'."\n";
     if (scalar(%$fullname) eq 0) {
 	my $colspan=3+scalar(@parts);
-	$result='<font color="red">There are no students in section "'.$ENV{'form.section'}.
-	    '" with enrollment status "'.$ENV{'form.Status'}.'" to modify or grade.</font>';
+	$result='<font color="red">There are no students in section "'.$env{'form.section'}.
+	    '" with enrollment status "'.$env{'form.Status'}.'" to modify or grade.</font>';
     }
     $result.=&show_grading_menu_form($symb,$url);
     return $result;
@@ -2367,22 +2653,41 @@ sub viewgrades {
 
 #--- call by previous routine to display each student
 sub viewstudentgrade {
-    my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr) = @_;
+    my ($url,$symb,$courseid,$student,$fullname,$parts,$weight,$ctr,$last_resets) = @_;
     my ($uname,$udom) = split(/:/,$student);
     $student=~s/:/_/;
     my %record=&Apache::lonnet::restore($symb,$courseid,$udom,$uname);
-    my $result='<tr bgcolor="#ffffdd"><td align="right">'.$ctr.'&nbsp;</td><td>&nbsp;'.
+    my %aggregates = (); 
+    my $result='<tr bgcolor="#ffffdd"><td align="right">'.
+	'<input type="hidden" name="ctr'.($ctr-1).'" value="'.$student.'" />'.
+	"\n".$ctr.'&nbsp;</td><td>&nbsp;'.
 	'<a href="javascript:viewOneStudent(\''.$uname.'\',\''.$udom.
 	'\')"; TARGET=_self>'.$fullname.'</a> '.
-	'<font color="#999999">('.$uname.($ENV{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
+	'<font color="#999999">('.$uname.($env{'user.domain'} eq $udom ? '' : ':'.$udom).')</font></td>'."\n";
     foreach my $apart (@$parts) {
 	my ($part,$type) = &split_part_type($apart);
 	my $score=$record{"resource.$part.$type"};
+        $result.='<td align="center">';
+        my ($aggtries,$totaltries);
+        unless (exists($aggregates{$part})) {
+	    $totaltries = $record{'resource.'.$part.'.tries'};
+
+	    $aggtries = $totaltries;
+            if ($$last_resets{$part}) {  
+                $aggtries = &get_num_tries(\%record,$$last_resets{$part},
+					   $part);
+            }
+            $result.='<input type="hidden" name="'.
+                'GD_'.$student.'_'.$part.'_aggtries" value="'.$aggtries.'" />'."\n";
+            $result.='<input type="hidden" name="'.
+                'GD_'.$student.'_'.$part.'_totaltries" value="'.$totaltries.'" />'."\n";
+            $aggregates{$part} = 1;
+        }
 	if ($type eq 'awarded') {
 	    my $pts = $score eq '' ? '' : $score*$$weight{$part};
 	    $result.='<input type="hidden" name="'.
 		'GD_'.$student.'_'.$part.'_awarded_s" value="'.$pts.'" />'."\n";
-	    $result.='<td align="middle"><input type="text" name="'.
+	    $result.='<input type="text" name="'.
 		'GD_'.$student.'_'.$part.'_awarded" '.
 		'onChange="javascript:changeSelect(\''.$part.'\',\''.$student.
 		'\')" value="'.$pts.'" size="4" /></td>'."\n";
@@ -2391,7 +2696,7 @@ sub viewstudentgrade {
 	    $status = 'nothing' if ($status eq '');
 	    $result.='<input type="hidden" name="'.'GD_'.$student.'_'.
 		$part.'_solved_s" value="'.$status.'" />'."\n";
-	    $result.='<td align="middle">&nbsp;<select name="'.
+	    $result.='&nbsp;<select name="'.
 		'GD_'.$student.'_'.$part.'_solved" '.
 		'onChange="javascript:changeOneScore(\''.$part.'\',\''.$student.'\')" >'."\n";
 	    $result.= (($status eq 'excused') ? '<option> </option><option selected="on">excused</option>' 
@@ -2402,7 +2707,7 @@ sub viewstudentgrade {
 	    $result.='<input type="hidden" name="'.
 		'GD_'.$student.'_'.$part.'_'.$type.'_s" value="'.$score.'" />'.
 		    "\n";
-	    $result.='<td align="middle"><input type="text" name="'.
+	    $result.='<input type="text" name="'.
 		'GD_'.$student.'_'.$part.'_'.$type.'" '.
 		'value="'.$score.'" size="4" /></td>'."\n";
 	}
@@ -2416,11 +2721,11 @@ sub viewstudentgrade {
 sub editgrades {
     my ($request) = @_;
 
-    my $symb=$ENV{'form.symb'};
-    my $url =$ENV{'form.url'};
+    my $symb=$env{'form.symb'};
+    my $url =$env{'form.url'};
     my $title='<h3><font color="#339933">Current Grade Status</font></h3>';
-    $title.='<font size=+1><b>Current Resource: </b>'.$ENV{'form.probTitle'}.'</font><br />'."\n";
-    $title.='<font size=+1><b>Section: </b>'.$ENV{'form.section'}.'</font>'."\n";
+    $title.='<font size=+1><b>Current Resource: </b>'.$env{'form.probTitle'}.'</font><br />'."\n";
+    $title.='<font size=+1><b>Section: </b>'.$env{'form.section'}.'</font>'."\n";
 
     my $result= '<table border="0"><tr><td bgcolor="#777777">'."\n";
     $result.= '<table border="0"><tr bgcolor="#deffff">'.
@@ -2434,7 +2739,7 @@ sub editgrades {
 		    'ungraded' =>'ungraded_attempted',
 		    'nothing'  => '',
 		    );
-    my ($classlist,undef,$fullname) = &getclasslist($ENV{'form.section'},'0');
+    my ($classlist,undef,$fullname) = &getclasslist($env{'form.section'},'0');
 
     my (@partid);
     my %weight = ();
@@ -2443,10 +2748,10 @@ sub editgrades {
 
     my (@parts) = sort(&getpartlist($url,$symb));
     my $header;
-    while ($ctr < $ENV{'form.totalparts'}) {
-	my $partid = $ENV{'form.partid_'.$ctr};
+    while ($ctr < $env{'form.totalparts'}) {
+	my $partid = $env{'form.partid_'.$ctr};
 	push @partid,$partid;
-	$weight{$partid} = $ENV{'form.weight_'.$partid};
+	$weight{$partid} = $env{'form.weight_'.$partid};
 	$ctr++;
     }
     foreach my $partid (@partid) {
@@ -2466,9 +2771,10 @@ sub editgrades {
 	}
     }
     foreach my $partid (@partid) {
+	my $display_part=&get_display_part($partid,$url,$symb);
 	$result .= '<td colspan="'.$columns{$partid}.
-	    '" align="center"><b>Part '.$partid.
-	    '</b> (Weight = '.$weight{$partid}.')</td>';
+	    '" align="center"><b>Part:</b> '.$display_part.
+	    ' (Weight = '.$weight{$partid}.')</td>';
 
     }
     $result .= '</tr><tr bgcolor="#deffff">';
@@ -2476,9 +2782,9 @@ sub editgrades {
     $result .= '</tr>'."\n";
     my $noupdate;
     my ($updateCtr,$noupdateCtr) = (1,1);
-    for ($i=0; $i<$ENV{'form.total'}; $i++) {
+    for ($i=0; $i<$env{'form.total'}; $i++) {
 	my $line;
-	my $user = $ENV{'form.ctr'.$i};
+	my $user = $env{'form.ctr'.$i};
 	my $usercolon = $user;
 	$usercolon =~s/_/:/;
 	my ($uname,$udom)=split(/_/,$user);
@@ -2491,24 +2797,25 @@ sub editgrades {
 	    $noupdate.=$line."<td colspan=\"$numcols\"><font color=\"red\">Not allowed to modify student</font></td></tr>";
 	    next;
 	}
+        my %aggregate = ();
+        my $aggregateflag = 0;
 	foreach (@partid) {
-	    my $old_aw    = $ENV{'form.GD_'.$user.'_'.$_.'_awarded_s'};
+	    my $old_aw    = $env{'form.GD_'.$user.'_'.$_.'_awarded_s'};
 	    my $old_part_pcr = $old_aw/($weight{$_} ne '0' ? $weight{$_}:1);
 	    my $old_part  = $old_aw eq '' ? '' : $old_part_pcr;
-	    my $old_score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
-
-	    my $awarded   = $ENV{'form.GD_'.$user.'_'.$_.'_awarded'};
+	    my $old_score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+	    my $awarded   = $env{'form.GD_'.$user.'_'.$_.'_awarded'};
 	    my $pcr       = $awarded/($weight{$_} ne '0' ? $weight{$_} : 1);
 	    my $partial   = $awarded eq '' ? '' : $pcr;
 	    my $score;
 	    if ($partial eq '') {
-		$score = $scoreptr{$ENV{'form.GD_'.$user.'_'.$_.'_solved_s'}};
+		$score = $scoreptr{$env{'form.GD_'.$user.'_'.$_.'_solved_s'}};
 	    } elsif ($partial > 0) {
 		$score = 'correct_by_override';
 	    } elsif ($partial == 0) {
 		$score = 'incorrect_by_override';
 	    }
-	    my $dropMenu = $ENV{'form.GD_'.$user.'_'.$_.'_solved'};
+	    my $dropMenu = $env{'form.GD_'.$user.'_'.$_.'_solved'};
 	    $score = 'excused' if (($dropMenu eq 'excused') && ($score ne 'excused'));
 
 	    if ($dropMenu eq 'reset status' &&
@@ -2517,8 +2824,15 @@ sub editgrades {
 		$newrecord{'resource.'.$_.'.solved'} = '';
 		$newrecord{'resource.'.$_.'.award'} = '';
 		$newrecord{'resource.'.$_.'.awarded'} = 0;
-		$newrecord{'resource.'.$_.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+		$newrecord{'resource.'.$_.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
 		$updateflag = 1;
+                if ($env{'form.GD_'.$user.'_'.$_.'_aggtries'} > 0) {
+                    my $aggtries = $env{'form.GD_'.$user.'_'.$_.'_aggtries'};
+                    my $totaltries = $env{'form.GD_'.$user.'_'.$_.'_totaltries'};
+                    my $solvedstatus = $env{'form.GD_'.$user.'_'.$_.'_solved_s'};
+                    &decrement_aggs($symb,$_,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                    $aggregateflag = 1;
+                }
 	    } elsif (!($old_part eq $partial && $old_score eq $score)) {
 		$updateflag = 1;
 		$newrecord{'resource.'.$_.'.awarded'}  = $partial if $partial ne '';
@@ -2536,11 +2850,11 @@ sub editgrades {
 		my ($part,$type) = &split_part_type($stores);
 		if ($part !~ m/^\Q$partid\E/) { next;}
 		if ($type eq 'awarded' || $type eq 'solved') { next; }
-		my $old_aw    = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
-		my $awarded   = $ENV{'form.GD_'.$user.'_'.$part.'_'.$type};
+		my $old_aw    = $env{'form.GD_'.$user.'_'.$part.'_'.$type.'_s'};
+		my $awarded   = $env{'form.GD_'.$user.'_'.$part.'_'.$type};
 		if ($awarded ne '' && $awarded ne $old_aw) {
 		    $newrecord{'resource.'.$part.'.'.$type}= $awarded;
-		    $newrecord{'resource.'.$part.'.regrader'}="$ENV{'user.name'}:$ENV{'user.domain'}";
+		    $newrecord{'resource.'.$part.'.regrader'}="$env{'user.name'}:$env{'user.domain'}";
 		    $updateflag=1;
 		}
 		$line .= '<td align="center">'.$old_aw.'&nbsp;</td>'.
@@ -2550,7 +2864,7 @@ sub editgrades {
 	$line.='</tr>'."\n";
 	if ($updateflag) {
 	    $count++;
-	    &Apache::lonnet::cstore(\%newrecord,$symb,$ENV{'request.course.id'},
+	    &Apache::lonnet::cstore(\%newrecord,$symb,$env{'request.course.id'},
 				    $udom,$uname);
 	    $result.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$updateCtr.'&nbsp;</td>'.$line;
 	    $updateCtr++;
@@ -2558,17 +2872,22 @@ sub editgrades {
 	    $noupdate.='<tr bgcolor="#ffffde"><td align="right">&nbsp;'.$noupdateCtr.'&nbsp;</td>'.$line;
 	    $noupdateCtr++;
 	}
+        if ($aggregateflag) {
+            &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                      $env{'course.'.$env{'request.course.id'}.'.domain'},
+                      $env{'course.'.$env{'request.course.id'}.'.num'});
+        }
     }
     if ($noupdate) {
 #	my $numcols=(scalar(@partid)*(scalar(@parts)-1)*2)+3;
 	my $numcols=scalar(@partid)*4+2;
-	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr>'.$noupdate;
+	$result .= '<tr bgcolor="#ffffff"><td align="center" colspan="'.$numcols.'">No Changes Occurred For the Students Below</td></tr><tr bgcolor="#ffffde">'.$noupdate;
     }
     $result .= '</table></td></tr></table>'."\n".
 	&show_grading_menu_form ($symb,$url);
     my $msg = '<br /><b>Number of records updated = '.$rec_update.
 	' for '.$count.' student'.($count <= 1 ? '' : 's').'.</b><br />'.
-	'<b>Total number of students = '.$ENV{'form.total'}.'</b><br />';
+	'<b>Total number of students = '.$env{'form.total'}.'</b><br />';
     return $title.$msg.$result;
 }
 
@@ -2591,24 +2910,26 @@ sub split_part_type {
 #
 #--- Javascript to handle csv upload
 sub csvupload_javascript_reverse_associate {
+    my $error1=&mt('You need to specify the username or ID');
+    my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
     var foundsomething=0;
     var founduname=0;
-    var founddomain=0;
+    var foundID=0;
     for (i=0;i<=vf.nfields.value;i++) {
       tw=eval('vf.f'+i+'.selectedIndex');
-      if (i==0 && tw!=0) { founduname=1; }
-      if (i==1 && tw!=0) { founddomain=1; }
-      if (i!=0 && i!=1 && tw!=0) { foundsomething=1; }
-    }
-    if (founduname==0 || founddomain==0) {
-      alert('You need to specify at both the username and domain');
-      return;
+      if (i==0 && tw!=0) { foundID=1; }
+      if (i==1 && tw!=0) { founduname=1; }
+      if (i!=0 && i!=1 && i!=2 && tw!=0) { foundsomething=1; }
+    }
+    if (founduname==0 && foundID==0) {
+	alert('$error1');
+	return;
     }
     if (foundsomething==0) {
-      alert('You need to specify at least one grading field');
-      return;
+	alert('$error2');
+	return;
     }
     vf.submit();
   }
@@ -2629,24 +2950,26 @@ ENDPICK
 }
 
 sub csvupload_javascript_forward_associate {
+    my $error1=&mt('You need to specify the username or ID');
+    my $error2=&mt('You need to specify at least one grading field');
   return(<<ENDPICK);
   function verify(vf) {
     var foundsomething=0;
     var founduname=0;
-    var founddomain=0;
+    var foundID=0;
     for (i=0;i<=vf.nfields.value;i++) {
       tw=eval('vf.f'+i+'.selectedIndex');
-      if (tw==1) { founduname=1; }
-      if (tw==2) { founddomain=1; }
-      if (tw>2) { foundsomething=1; }
-    }
-    if (founduname==0 || founddomain==0) {
-      alert('You need to specify at both the username and domain');
-      return;
+      if (tw==1) { foundID=1; }
+      if (tw==2) { founduname=1; }
+      if (tw>3) { foundsomething=1; }
+    }
+    if (founduname==0 && foundID==0) {
+	alert('$error1');
+	return;
     }
     if (foundsomething==0) {
-      alert('You need to specify at least one grading field');
-      return;
+	alert('$error2');
+	return;
     }
     vf.submit();
   }
@@ -2666,14 +2989,15 @@ ENDPICK
 sub csvuploadmap_header {
     my ($request,$symb,$url,$datatoken,$distotal)= @_;
     my $javascript;
-    if ($ENV{'form.upfile_associate'} eq 'reverse') {
+    if ($env{'form.upfile_associate'} eq 'reverse') {
 	$javascript=&csvupload_javascript_reverse_associate();
     } else {
 	$javascript=&csvupload_javascript_forward_associate();
     }
 
-    my ($result) = &showResourceInfo($url,$ENV{'form.probTitle'});
-
+    my ($result) = &showResourceInfo($url,$env{'form.probTitle'});
+    my $checked=(($env{'form.noFirstLine'})?' checked="checked"':'');
+    my $ignore=&mt('Ignore First Line');
     $request->print(<<ENDPICK);
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <h3><font color="#339933">Uploading Class Grades</font></h3>
@@ -2684,18 +3008,19 @@ Total number of records found in file: $
 Enter as many fields as you can. The system will inform you and bring you back
 to this page if the data selected is insufficient to run your class.<hr />
 <input type="button" value="Reverse Association" onClick="javascript:this.form.associate.value='Reverse Association';submit(this.form);" />
+<label><input type="checkbox" name="noFirstLine" $checked />$ignore</label>
 <input type="hidden" name="associate"  value="" />
 <input type="hidden" name="phase"      value="three" />
 <input type="hidden" name="datatoken"  value="$datatoken" />
-<input type="hidden" name="fileupload" value="$ENV{'form.fileupload'}" />
-<input type="hidden" name="upfiletype" value="$ENV{'form.upfiletype'}" />
+<input type="hidden" name="fileupload" value="$env{'form.fileupload'}" />
+<input type="hidden" name="upfiletype" value="$env{'form.upfiletype'}" />
 <input type="hidden" name="upfile_associate" 
-                                       value="$ENV{'form.upfile_associate'}" />
+                                       value="$env{'form.upfile_associate'}" />
 <input type="hidden" name="symb"       value="$symb" />
 <input type="hidden" name="url"        value="$url" />
-<input type="hidden" name="saveState"  value="$ENV{'form.saveState'}" />
-<input type="hidden" name="probTitle"  value="$ENV{'form.probTitle'}" />
-<input type="hidden" name="command"    value="csvuploadassign" />
+<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
+<input type="hidden" name="probTitle"  value="$env{'form.probTitle'}" />
+<input type="hidden" name="command"    value="csvuploadoptions" />
 <hr />
 <script type="text/javascript" language="Javascript">
 $javascript
@@ -2708,13 +3033,18 @@ ENDPICK
 sub csvupload_fields {
     my ($url,$symb) = @_;
     my (@parts) = &getpartlist($url,$symb);
-    my @fields=(['username','Student Username'],['domain','Student Domain']);
+    my @fields=(['ID','Student ID'],
+		['username','Student Username'],
+		['domain','Student Domain']);
     foreach my $part (sort(@parts)) {
 	my @datum;
 	my $display=&Apache::lonnet::metadata($url,$part.'.display');
 	my $name=$part;
 	if  (!$display) { $display = $name; }
 	@datum=($name,$display);
+	if ($name=~/^stores_(.*)_awarded/) {
+	    push(@fields,['stores_'.$1.'_points',"Points [Part: $1]"]);
+	}
 	push(@fields,\@datum);
     }
     return (@fields);
@@ -2746,8 +3076,8 @@ sub upcsvScores_form {
     }
     </script>
 CSVFORMJS
-    $ENV{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
-    my ($table) = &showResourceInfo($url,$ENV{'form.probTitle'});
+    $env{'form.probTitle'} = &Apache::lonnet::gettitle($symb);
+    my ($table) = &showResourceInfo($url,$env{'form.probTitle'});
     $result.=$table;
     $result.='<br /><table width=100% border=0><tr><td bgcolor="#777777">'."\n";
     $result.='<table width=100% border=0><tr bgcolor="#e6ffff"><td>'."\n";
@@ -2755,16 +3085,17 @@ CSVFORMJS
 	'.</b></td></tr>'."\n";
     $result.='<tr bgcolor=#ffffe6><td>'."\n";
     my $upfile_select=&Apache::loncommon::upfile_select_html();
+    my $ignore=&mt('Ignore First Line');
     $result.=<<ENDUPFORM;
 <form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
 <input type="hidden" name="symb" value="$symb" />
 <input type="hidden" name="url" value="$url" />
 <input type="hidden" name="command" value="csvuploadmap" />
-<input type="hidden" name="probTitle" value="$ENV{'form.probTitle'}" />
-<input type="hidden" name="saveState"  value="$ENV{'form.saveState'}" />
+<input type="hidden" name="probTitle" value="$env{'form.probTitle'}" />
+<input type="hidden" name="saveState"  value="$env{'form.saveState'}" />
 $upfile_select
 <br /><input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scores" />
-
+<label><input type="checkbox" name="noFirstLine" />$ignore</lable>
 </form>
 ENDUPFORM
     $result.='</td></tr></table>'."\n";
@@ -2780,19 +3111,20 @@ sub csvuploadmap {
     if (!$symb) {return '';}
 
     my $datatoken;
-    if (!$ENV{'form.datatoken'}) {
+    if (!$env{'form.datatoken'}) {
 	$datatoken=&Apache::loncommon::upfile_store($request);
     } else {
-	$datatoken=$ENV{'form.datatoken'};
+	$datatoken=$env{'form.datatoken'};
 	&Apache::loncommon::load_tmp_file($request);
     }
     my @records=&Apache::loncommon::upfile_record_sep();
+    if ($env{'form.noFirstLine'}) { shift(@records); }
     &csvuploadmap_header($request,$symb,$url,$datatoken,$#records+1);
     my ($i,$keyfields);
     if (@records) {
 	my @fields=&csvupload_fields($url,$symb);
 
-	if ($ENV{'form.upfile_associate'} eq 'reverse') {	
+	if ($env{'form.upfile_associate'} eq 'reverse') {	
 	    &Apache::loncommon::csv_print_samples($request,\@records);
 	    $i=&Apache::loncommon::csv_print_select_table($request,\@records,
 							  \@fields);
@@ -2812,39 +3144,104 @@ sub csvuploadmap {
     return '';
 }
 
-sub csvuploadassign {
+sub csvuploadoptions {
     my ($request)= @_;
     my ($symb,$url)=&get_symb_and_url($request);
-    if (!$symb) {return '';}
-    &Apache::loncommon::load_tmp_file($request);
-    my @gradedata = &Apache::loncommon::upfile_record_sep();
-    my @keyfields = split(/\,/,$ENV{'form.keyfields'});
-    my %fields=();
-    for (my $i=0; $i<=$ENV{'form.nfields'}; $i++) {
-	if ($ENV{'form.upfile_associate'} eq 'reverse') {
-	    if ($ENV{'form.f'.$i} ne 'none') {
-		$fields{$keyfields[$i]}=$ENV{'form.f'.$i};
+    my $checked=(($env{'form.noFirstLine'})?'1':'0');
+    my $ignore=&mt('Ignore First Line');
+    $request->print(<<ENDPICK);
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="gradesupload">
+<h3><font color="#339933">Uploading Class Grade Options</font></h3>
+<input type="hidden" name="command"    value="csvuploadassign" />
+<input type="submit" value="Assign Grades" /><br />
+<p>
+<label>
+   <input type="checkbox" name="show_full_results" />
+   Show a table of all changes
+</label>
+</p>
+<p>
+<label>
+   <input type="checkbox" name="overwite_scores" checked="checked" />
+   Overwrite any existing score
+</label>
+</p>
+ENDPICK
+    my %fields=&get_fields();
+    if (!defined($fields{'domain'})) {
+	my $domform = &Apache::loncommon::select_dom_form($env{'request.role.domain'},'default_domain');
+	$request->print("\n<p> Users are in domain: ".$domform."</p>\n");
+    }
+    foreach my $key (sort(keys(%env))) {
+	if ($key !~ /^form\.(.*)$/) { next; }
+	my $cleankey=$1;
+	if ($cleankey eq 'command') { next; }
+	$request->print('<input type="hidden" name="'.$cleankey.
+			'"  value="'.$env{$key}.'" />'."\n");
+    }
+    # FIXME do a check for any duplicated user ids...
+    # FIXME do a check for any invalid user ids?...
+    $request->print("<hr /></form>\n");
+    $request->print(&show_grading_menu_form($symb,$url));
+    return '';
+}
+
+sub get_fields {
+    my %fields;
+    my @keyfields = split(/\,/,$env{'form.keyfields'});
+    for (my $i=0; $i<=$env{'form.nfields'}; $i++) {
+	if ($env{'form.upfile_associate'} eq 'reverse') {
+	    if ($env{'form.f'.$i} ne 'none') {
+		$fields{$keyfields[$i]}=$env{'form.f'.$i};
 	    }
 	} else {
-	    if ($ENV{'form.f'.$i} ne 'none') {
-		$fields{$ENV{'form.f'.$i}}=$keyfields[$i];
+	    if ($env{'form.f'.$i} ne 'none') {
+		$fields{$env{'form.f'.$i}}=$keyfields[$i];
 	    }
 	}
     }
+    return %fields;
+}
+
+sub csvuploadassign {
+    my ($request)= @_;
+    my ($symb,$url)=&get_symb_and_url($request);
+    if (!$symb) {return '';}
+    &Apache::loncommon::load_tmp_file($request);
+    my @gradedata = &Apache::loncommon::upfile_record_sep();
+    if ($env{'form.noFirstLine'}) { shift(@gradedata); }
+    my %fields=&get_fields();
     $request->print('<h3>Assigning Grades</h3>');
-    my $courseid=$ENV{'request.course.id'};
+    my $courseid=$env{'request.course.id'};
     my ($classlist) = &getclasslist('all',0);
     my @notallowed;
     my @skipped;
     my $countdone=0;
     foreach my $grade (@gradedata) {
 	my %entries=&Apache::loncommon::record_sep($grade);
+	my $domain;
+	if ($entries{$fields{'domain'}}) {
+	    $domain=$entries{$fields{'domain'}};
+	} else {
+	    $domain=$env{'form.default_domain'};
+	}
+	$domain=~s/\s//g;
 	my $username=$entries{$fields{'username'}};
 	$username=~s/\s//g;
-	my $domain=$entries{$fields{'domain'}};
-	$domain=~s/\s//g;
+	if (!$username) {
+	    my $id=$entries{$fields{'ID'}};
+	    $id=~s/\s//g;
+	    my %ids=&Apache::lonnet::idget($domain,$id);
+	    $username=$ids{$id};
+	}
 	if (!exists($$classlist{"$username:$domain"})) {
-	    push(@skipped,"$username:$domain");
+	    my $id=$entries{$fields{'ID'}};
+	    $id=~s/\s//g;
+	    if ($id) {
+		push(@skipped,"$id:$domain");
+	    } else {
+		push(@skipped,"$username:$domain");
+	    }
 	    next;
 	}
 	my $usec=$classlist->{"$username:$domain"}[5];
@@ -2852,17 +3249,35 @@ sub csvuploadassign {
 	    push(@notallowed,"$username:$domain");
 	    next;
 	}
+	my %points;
 	my %grades;
 	foreach my $dest (keys(%fields)) {
-	    if ($dest eq 'username' || $dest eq 'domain') { next; }
-	    if ($entries{$fields{$dest}} eq '') { next; }
-	    my $store_key=$dest;
-	    $store_key=~s/^stores/resource/;
-	    $store_key=~s/_/\./g;
-	    $grades{$store_key}=$entries{$fields{$dest}};
+	    if ($dest eq 'ID' || $dest eq 'username' ||
+		$dest eq 'domain') { next; }
+	    if ($entries{$fields{$dest}} =~ /^\s*$/) { next; }
+	    if ($dest=~/stores_(.*)_points/) {
+		my $part=$1;
+		my $wgt =&Apache::lonnet::EXT('resource.'.$part.'.weight',
+					      $symb,$domain,$username);
+		$entries{$fields{$dest}}=~s/\s//g;
+		my $pcr=$entries{$fields{$dest}} / $wgt;
+		my $award='correct_by_override';
+		$grades{"resource.$part.awarded"}=$pcr;
+		$grades{"resource.$part.solved"}=$award;
+		$points{$part}=1;
+	    } else {
+		if ($dest=~/stores_(.*)_awarded/) { if ($points{$1}) {next;} }
+		if ($dest=~/stores_(.*)_solved/)  { if ($points{$1}) {next;} }
+		my $store_key=$dest;
+		$store_key=~s/^stores/resource/;
+		$store_key=~s/_/\./g;
+		$grades{$store_key}=$entries{$fields{$dest}};
+	    }
 	}
-	$grades{"resource.regrader"}="$ENV{'user.name'}:$ENV{'user.domain'}";
-	&Apache::lonnet::cstore(\%grades,$symb,$ENV{'request.course.id'},
+	if (! %grades) { push(@skipped,"$username:$domain no data to store"); }
+	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+#	&Apache::lonnet::logthis(" storing ".(join('-',%grades)));
+	&Apache::lonnet::cstore(\%grades,$symb,$env{'request.course.id'},
 				$domain,$username);
 	$request->print('.');
 	$request->rflush();
@@ -2909,9 +3324,9 @@ function checkPickOne(formname) {
 LISTJAVASCRIPT
     &commonJSfunctions($request);
     my ($symb,$url) = &get_symb_and_url($request);
-    my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
-    my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
-    my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
+    my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
+    my $cnum      = $env{"course.$env{'request.course.id'}.num"};
+    my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
 
     my $result='<h3><font color="#339933">&nbsp;'.
 	'Manual Grading by Page or Sequence</font></h3>';
@@ -2950,11 +3365,11 @@ LISTJAVASCRIPT
 	'<input type="radio" name="lastSub" value="all" /> all details'."\n";
 
     $result.='<input type="hidden" name="section"     value="'.$getsec.'" />'."\n".
-	'<input type="hidden" name="Status"  value="'.$ENV{'form.Status'}.'" />'."\n".
+	'<input type="hidden" name="Status"  value="'.$env{'form.Status'}.'" />'."\n".
 	'<input type="hidden" name="command" value="displayPage" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."<br />\n";
+	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
 
     $result.='&nbsp;<input type="button" '.
 	'onClick="javascript:checkPickOne(this.form);"value="Next->" /><br />'."\n";
@@ -3000,7 +3415,8 @@ sub getSymbMap {
     my $minder = 0;
 
     # Gather every sequence that has problems.
-    my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); }, 1);
+    my @sequences = $navmap->retrieveResources(undef, sub { shift->is_map(); },
+					       1,0,1);
     for my $sequence ($navmap->getById('0.0'), @sequences) {
 	if ($navmap->hasResource($sequence, sub { shift->is_problem(); }, 0) ) {
 	    my $title = $minder.'.'.$sequence->compTitle();
@@ -3009,8 +3425,6 @@ sub getSymbMap {
 	    $minder++;
 	}
     }
-
-    $navmap->untieHashes();
     return \@titles,\%symbx;
 }
 
@@ -3020,26 +3434,34 @@ sub displayPage {
     my ($request) = shift;
 
     my ($symb,$url) = &get_symb_and_url($request);
-    my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
-    my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
-    my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
-    my $pageTitle = $ENV{'form.page'};
+    my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
+    my $cnum      = $env{"course.$env{'request.course.id'}.num"};
+    my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+    my $pageTitle = $env{'form.page'};
     my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
-    my ($uname,$udom) = split(/:/,$ENV{'form.student'});
-    my $usec=$classlist->{$ENV{'form.student'}}[5];
+    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('<font color="red">Unable to view requested student.('.$env{'form.student'}.')</font>');
 	$request->print(&show_grading_menu_form($symb,$url));
 	return;
     }
-    my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
-    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$ENV{'form.student'}},$uname,$udom).
+    my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
+    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom).
 	'</h3>'."\n";
     &sub_page_js($request);
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my ($mapUrl, $id, $resUrl)=&Apache::lonnet::decode_symb($ENV{'form.page'});
+    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(),
@@ -3047,14 +3469,14 @@ sub displayPage {
 
     my $studentTable='<form action="/adm/grades" method="post" name="gradePage">'."\n".
 	'<input type="hidden" name="command" value="gradeByPage" />'."\n".
-	'<input type="hidden" name="fullname" value="'.$$fullname{$ENV{'form.student'}}.'" />'."\n".
-	'<input type="hidden" name="student" value="'.$ENV{'form.student'}.'" />'."\n".
+	'<input type="hidden" name="fullname" value="'.$$fullname{$env{'form.student'}}.'" />'."\n".
+	'<input type="hidden" name="student" value="'.$env{'form.student'}.'" />'."\n".
 	'<input type="hidden" name="page"    value="'.$pageTitle.'" />'."\n".
-	'<input type="hidden" name="title"   value="'.$ENV{'form.title'}.'" />'."\n".
+	'<input type="hidden" name="title"   value="'.$env{'form.title'}.'" />'."\n".
 	'<input type="hidden" name="url"     value="'.$url.'" />'."\n".
 	'<input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="overRideScore" value="no" />'."\n".
-	'<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n";
+	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n";
 
     my $checkIcon = '<img src="'.$request->dir_config('lonIconsURL').
 	'/check.gif" height="16" border="0" />';
@@ -3064,27 +3486,27 @@ sub displayPage {
 	'<table border="0"><tr><td bgcolor="#777777">'.
 	'<table border="0"><tr bgcolor="#e6ffff">'.
 	'<td align="center"><b>&nbsp;Prob.&nbsp;</b></td>'.
-	'<td><b>&nbsp;'.($ENV{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
+	'<td><b>&nbsp;'.($env{'form.vProb'} eq 'no' ? 'Title' : 'Problem Text').'/Grade</b></td></tr>';
 
-    my ($depth,$question) = (1,1);
+    my ($depth,$question,$prob) = (1,1,1);
     $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"
     while ($depth > 0) {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
 
-        if (ref($curRes) && $curRes->is_problem()) {
+        if (ref($curRes) && $curRes->is_problem() && !$curRes->randomout) {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
-	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
 	    $studentTable.='<td valign="top">';
-	    if ($ENV{'form.vProb'} eq 'yes' ) {
+	    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'});
+		my $companswer = &Apache::loncommon::get_student_answers($symbx,$uname,$udom,$env{'request.course.id'});
 		$companswer =~ s|<form(.*?)>||g;
 		$companswer =~ s|</form>||g;
 #		while ($companswer =~ /(<a href\=\"javascript:newWindow.*?Script Vars<\/a>)/s) { #<a href="javascript:newWindow</a>
@@ -3095,9 +3517,9 @@ sub displayPage {
 		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br>&nbsp;<b>Correct answer:</b><br>'.$companswer;
 	    }
 
-	    my %record = &Apache::lonnet::restore($symbx,$ENV{'request.course.id'},$udom,$uname);
+	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
 
-	    if ($ENV{'form.lastSub'} eq 'datesub') {
+	    if ($env{'form.lastSub'} eq 'datesub') {
 		if ($record{'version'} eq '') {
 		    $studentTable.='<br />&nbsp;<font color="red">No recorded submission for this problem</font><br />';
 		} else {
@@ -3114,10 +3536,10 @@ sub displayPage {
 		    $studentTable.= &displaySubByDates($symbx,\%record,$parts,\%responseType,$checkIcon,$uname,$udom);
 
 		}
-	    } elsif ($ENV{'form.lastSub'} eq 'all') {
-		my $last = ($ENV{'form.lastSub'} eq 'last' ? 'last' : '');
+	    } elsif ($env{'form.lastSub'} eq 'all') {
+		my $last = ($env{'form.lastSub'} eq 'last' ? 'last' : '');
 		$studentTable.=&Apache::loncommon::get_previous_attempt($symbx,$uname,$udom,
-									$ENV{'request.course.id'},
+									$env{'request.course.id'},
 									'','.submission');
  
 	    }
@@ -3127,6 +3549,7 @@ sub displayPage {
 		    $studentTable.='<input type="hidden" name="q_'.$question.'" value="'.$partid.'" />'."\n";
 		    $question++;
 		}
+		$prob++;
 	    }
 	    $studentTable.='</td></tr>';
 
@@ -3134,8 +3557,6 @@ sub displayPage {
         $curRes = $iterator->next();
     }
 
-    $navmap->untieHashes();
-
     $studentTable.='</td></tr></table></td></tr></table>'."\n".
 	'<input type="button" value="Save" '.
 	'onClick="javascript:checkSubmitPage(this.form,'.$question.');" TARGET=_self />'.
@@ -3148,9 +3569,12 @@ sub displayPage {
 
 sub displaySubByDates {
     my ($symb,$record,$parts,$responseType,$checkIcon,$uname,$udom) = @_;
+    my $isCODE=0;
+    if (exists($record->{'resource.CODE'})) { $isCODE=1; }
     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>'.
+	($isCODE?'<td><b>CODE</b></td>':'').
 	'<td><b>Submission</b></td>'.
 	'<td><b>Status&nbsp;</b></td></tr>';
     my ($version);
@@ -3163,17 +3587,22 @@ sub displaySubByDates {
     for ($version=1;$version<=$$record{'version'};$version++) {
 	my $timestamp = scalar(localtime($$record{$version.':timestamp'}));
 	$studentTable.='<tr bgcolor="#ffffff" valign="top"><td>'.$timestamp.'</td>';
+	if ($isCODE) {
+	    $studentTable.='<td>'.$record->{$version.':resource.CODE'}.'</td>';
+	}
 	my @versionKeys = split(/\:/,$$record{$version.':keys'});
 	my @displaySub = ();
 	foreach my $partid (@{$parts}) {
 	    my @matchKey = sort(grep /^resource\.\Q$partid\E\..*?\.submission$/,@versionKeys);
 #	    next if ($$record{"$version:resource.$partid.solved"} eq '');
+	    my $display_part=&get_display_part($partid,undef,$symb);
 	    foreach my $matchKey (@matchKey) {
-		if (exists $$record{$version.':'.$matchKey}) {
+		if (exists($$record{$version.':'.$matchKey}) &&
+		    $$record{$version.':'.$matchKey} ne '') {
 		    my ($responseId)=($matchKey=~ /^resource\.\Q$partid\E\.(.*?)\.submission$/);
-		    $displaySub[0].='<b>Part&nbsp;'.$partid.'&nbsp;';
+		    $displaySub[0].='<b>Part:</b>&nbsp;'.$display_part.'&nbsp;';
 		    $displaySub[0].='<font color="#999999">(ID&nbsp;'.
-			$responseId.')</font>&nbsp;';
+			$responseId.')</font>&nbsp;<b>';
 		    if ($$record{"$version:resource.$partid.tries"} eq '') {
 			$displaySub[0].='Trial&nbsp;not&nbsp;counted';
 		    } else {
@@ -3191,14 +3620,14 @@ sub displaySubByDates {
 		}
 	    }
 	    if (exists $$record{"$version:resource.$partid.award"}) {
-		$displaySub[1].='<b>Part&nbsp;'.$partid.'</b> &nbsp;'.
+		$displaySub[1].='<b>Part:</b>&nbsp;'.$display_part.' &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>Part:</b> '.$partid.')';
+		    ' (<b>'.&mt('Part').':</b> '.$display_part.')';
 	    }
 	}
 	# needed because old essay regrader has not parts info
@@ -3219,26 +3648,26 @@ sub displaySubByDates {
 sub updateGradeByPage {
     my ($request) = shift;
 
-    my $cdom      = $ENV{"course.$ENV{'request.course.id'}.domain"};
-    my $cnum      = $ENV{"course.$ENV{'request.course.id'}.num"};
-    my $getsec    = $ENV{'form.section'} eq '' ? 'all' : $ENV{'form.section'};
-    my $pageTitle = $ENV{'form.page'};
+    my $cdom      = $env{"course.$env{'request.course.id'}.domain"};
+    my $cnum      = $env{"course.$env{'request.course.id'}.num"};
+    my $getsec    = $env{'form.section'} eq '' ? 'all' : $env{'form.section'};
+    my $pageTitle = $env{'form.page'};
     my ($classlist,undef,$fullname) = &getclasslist($getsec,'1');
-    my ($uname,$udom) = split(/:/,$ENV{'form.student'});
-    my $usec=$classlist->{$ENV{'form.student'}}[5];
+    my ($uname,$udom) = split(/:/,$env{'form.student'});
+    my $usec=$classlist->{$env{'form.student'}}[5];
     if (!&canmodify($usec)) {
-	$request->print('<font color="red">Unable to modify requested student.('.$ENV{'form.student'}.'</font>');
-	$request->print(&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'}));
+	$request->print('<font color="red">Unable to modify requested student.('.$env{'form.student'}.'</font>');
+	$request->print(&show_grading_menu_form($env{'form.symb'},$env{'form.url'}));
 	return;
     }
-    my $result='<h3><font color="#339933">&nbsp;'.$ENV{'form.title'}.'</font></h3>';
-    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$ENV{'form.fullname'},$uname,$udom).
+    my $result='<h3><font color="#339933">&nbsp;'.$env{'form.title'}.'</font></h3>';
+    $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
 	'</h3>'."\n";
 
     $request->print($result);
 
     my $navmap = Apache::lonnavmaps::navmap->new();
-    my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $ENV{'form.page'});
+    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(),
@@ -3253,7 +3682,7 @@ sub updateGradeByPage {
 
     $iterator->next(); # skip the first BEGIN_MAP
     my $curRes = $iterator->next(); # for "current resource"
-    my ($depth,$question,$changeflag)= (1,1,0);
+    my ($depth,$question,$prob,$changeflag)= (1,1,1,0);
     while ($depth > 0) {
         if($curRes == $iterator->BEGIN_MAP) { $depth++; }
         if($curRes == $iterator->END_MAP) { $depth--; }
@@ -3262,18 +3691,20 @@ sub updateGradeByPage {
 	    my $parts = $curRes->parts();
             my $title = $curRes->compTitle();
 	    my $symbx = $curRes->symb();
-	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$question.
+	    $studentTable.='<tr bgcolor="#ffffe6"><td align="center" valign="top" >'.$prob.
 		(scalar(@{$parts}) == 1 ? '' : '<br>('.scalar(@{$parts}).'&nbsp;parts)').'</td>';
 	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
 
 	    my %newrecord=();
 	    my @displayPts=();
+            my %aggregate = ();
+            my $aggregateflag = 0;
 	    foreach my $partid (@{$parts}) {
-		my $newpts = $ENV{'form.GD_BOX'.$question.'_'.$partid};
-		my $oldpts = $ENV{'form.oldpts'.$question.'_'.$partid};
+		my $newpts = $env{'form.GD_BOX'.$question.'_'.$partid};
+		my $oldpts = $env{'form.oldpts'.$question.'_'.$partid};
 
-		my $wgt = $ENV{'form.WGT'.$question.'_'.$partid} != 0 ? 
-		    $ENV{'form.WGT'.$question.'_'.$partid} : 1;
+		my $wgt = $env{'form.WGT'.$question.'_'.$partid} != 0 ? 
+		    $env{'form.WGT'.$question.'_'.$partid} : 1;
 		my $partial = $newpts/$wgt;
 		my $score;
 		if ($partial > 0) {
@@ -3281,26 +3712,35 @@ sub updateGradeByPage {
 		} elsif ($newpts ne '') { #empty is taken as 0
 		    $score = 'incorrect_by_override';
 		}
-		my $dropMenu = $ENV{'form.GD_SEL'.$question.'_'.$partid};
+		my $dropMenu = $env{'form.GD_SEL'.$question.'_'.$partid};
 		if ($dropMenu eq 'excused') {
 		    $partial = '';
 		    $score = 'excused';
 		} elsif ($dropMenu eq 'reset status'
-			 && $ENV{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
+			 && $env{'form.solved'.$question.'_'.$partid} ne '') { #update only if previous record exists
 		    $newrecord{'resource.'.$partid.'.tries'} = 0;
 		    $newrecord{'resource.'.$partid.'.solved'} = '';
 		    $newrecord{'resource.'.$partid.'.award'} = '';
 		    $newrecord{'resource.'.$partid.'.awarded'} = 0;
-		    $newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}";
+		    $newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}";
 		    $changeflag++;
 		    $newpts = '';
-		}
-
-		my $oldstatus = $ENV{'form.solved'.$question.'_'.$partid};
-		$displayPts[0].='&nbsp;<b>Part</b> '.$partid.' = '.
+                    
+                    my $aggtries =  $env{'form.aggtries'.$question.'_'.$partid};
+                    my $totaltries = $env{'form.totaltries'.$question.'_'.$partid};
+                    my $solvedstatus = $env{'form.solved'.$question.'_'.$partid};
+                    if ($aggtries > 0) {
+                        &decrement_aggs($symbx,$partid,\%aggregate,$aggtries,$totaltries,$solvedstatus);
+                        $aggregateflag = 1;
+                    }
+		}
+		my $display_part=&get_display_part($partid,undef,
+						   $curRes->symb());
+		my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
+		$displayPts[0].='&nbsp;<b>Part:</b> '.$display_part.' = '.
 		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
 		    '&nbsp;<br>';
-		$displayPts[1].='&nbsp;<b>Part</b> '.$partid.' = '.
+		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
 		     (($score eq 'excused') ? 'excused' : $newpts).
 		    '&nbsp;<br>';
 
@@ -3309,28 +3749,32 @@ sub updateGradeByPage {
 
 		$newrecord{'resource.'.$partid.'.awarded'}  = $partial if $partial ne '';
 		$newrecord{'resource.'.$partid.'.solved'}   = $score if $score ne '';
-		$newrecord{'resource.'.$partid.'.regrader'} = "$ENV{'user.name'}:$ENV{'user.domain'}"
+		$newrecord{'resource.'.$partid.'.regrader'} = "$env{'user.name'}:$env{'user.domain'}"
 		    if (scalar(keys(%newrecord)) > 0);
 
 		$changeflag++;
 	    }
 	    if (scalar(keys(%newrecord)) > 0) {
-		&Apache::lonnet::cstore(\%newrecord,$symbx,$ENV{'request.course.id'},
+		&Apache::lonnet::cstore(\%newrecord,$symbx,$env{'request.course.id'},
 					$udom,$uname);
 	    }
+            if ($aggregateflag) {
+                &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
+                      $env{'course.'.$env{'request.course.id'}.'.domain'},
+                      $env{'course.'.$env{'request.course.id'}.'.num'});
+            }
 
 	    $studentTable.='<td valign="top">'.$displayPts[0].'</td>'.
 		'<td valign="top">'.$displayPts[1].'</td>'.
 		'</tr>';
 
+	    $prob++;
 	}
         $curRes = $iterator->next();
     }
 
-    $navmap->untieHashes();
-
     $studentTable.='</td></tr></table></td></tr></table>';
-    $studentTable.=&show_grading_menu_form($ENV{'form.symb'},$ENV{'form.url'});
+    $studentTable.=&show_grading_menu_form($env{'form.symb'},$env{'form.url'});
     my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
 		  'The scores were changed for '.
 		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
@@ -3352,8 +3796,8 @@ sub defaultFormData {
     return '
       <input type="hidden" name="symb"    value="'.$symb.'" />'."\n".
      '<input type="hidden" name="url"     value="'.$url.'" />'."\n".
-     '<input type="hidden" name="saveState" value="'.$ENV{'form.saveState'}.'" />'."\n".
-     '<input type="hidden" name="probTitle" value="'.$ENV{'form.probTitle'}.'" />'."\n";
+     '<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."\n".
+     '<input type="hidden" name="probTitle" value="'.$env{'form.probTitle'}.'" />'."\n";
 }
 
 sub getSequenceDropDown {
@@ -3373,18 +3817,27 @@ sub getSequenceDropDown {
     return $result;
 }
 
-sub scantron_uploads {
-    if (!-e $Apache::lonnet::perlvar{'lonScansDir'}) { return ''};
-    my $result=	'<select name="scantron_selectfile">';
-    my $cdom=$ENV{'course.'.$ENV{'request.course.id'}.'.domain'};
-    my $cname=$ENV{'course.'.$ENV{'request.course.id'}.'.num'};
+sub scantron_filenames {
+    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::locommon::propath($cdom,$cname));
-    foreach my $filename (@files) {
+				    &Apache::loncommon::propath($cdom,$cname));
+    my @possiblenames;
+    foreach my $filename (sort(@files)) {
 	($filename)=split(/&/,$filename);
 	if ($filename!~/^scantron_orig_/) { next ; }
 	$filename=~s/^scantron_orig_//;
-	$result.="<option>$filename</option>\n";
+	push(@possiblenames,$filename);
+    }
+    return @possiblenames;
+}
+
+sub scantron_uploads {
+    my ($file2grade) = @_;
+    my $result=	'<select name="scantron_selectfile">';
+    $result.="<option></option>";
+    foreach my $filename (sort(&scantron_filenames())) {
+	$result.="<option".($filename eq $file2grade ? ' selected="on"':'').">$filename</option>\n";
     }
     $result.="</select>";
     return $result;
@@ -3393,6 +3846,7 @@ sub scantron_uploads {
 sub scantron_scantab {
     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
     my $result='<select name="scantron_format">'."\n";
+    $result.='<option></option>'."\n";
     foreach my $line (<$fh>) {
 	my ($name,$descrip)=split(/:/,$line);
 	if ($name =~ /^\#/) { next; }
@@ -3403,63 +3857,172 @@ sub scantron_scantab {
     return $result;
 }
 
+sub scantron_CODElist {
+    my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+    my @names=&Apache::lonnet::getkeys('CODEs',$cdom,$cnum);
+    my $namechoice='<option></option>';
+    foreach my $name (sort {uc($a) cmp uc($b)} @names) {
+	if ($name =~ /^error: 2 /) { next; }
+	$namechoice.='<option value="'.$name.'">'.$name.'</option>';
+    }
+    $namechoice='<select name="scantron_CODElist">'.$namechoice.'</select>';
+    return $namechoice;
+}
+
+sub scantron_CODEunique {
+    my $result='<nobr>
+                 <label><input type="radio" name="scantron_CODEunique"
+                        value="Yes" checked="on" /> Yes </label>
+                </nobr>
+                <nobr>
+                 <label><input type="radio" name="scantron_CODEunique"
+                        value="No" /> No </label>
+                </nobr>';
+    return $result;
+}
+
 sub scantron_selectphase {
-    my ($r) = @_;
+    my ($r,$file2grade) = @_;
     my ($symb,$url)=&get_symb_and_url($r);
     if (!$symb) {return '';}
     my $sequence_selector=&getSequenceDropDown($r,$symb);
     my $default_form_data=&defaultFormData($symb,$url);
     my $grading_menu_button=&show_grading_menu_form($symb,$url);
-    my $file_selector=&scantron_uploads();
+    my $file_selector=&scantron_uploads($file2grade);
     my $format_selector=&scantron_scantab();
+    my $CODE_selector=&scantron_CODElist();
+    my $CODE_unique=&scantron_CODEunique();
     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_validate" />
-  $default_form_data
-  <table width="100%" border="0">
+    <table width="100%" border="0">
     <tr>
+     <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantron_process">
       <td bgcolor="#777777">
+       <input type="hidden" name="command" value="scantron_warning" />
+        $default_form_data
         <table width="100%" border="0">
           <tr bgcolor="#e6ffff">
-            <td>
-              &nbsp;<b>Specify file location and which Folder/Sequence to grade</b>
+            <td colspan="2">
+              &nbsp;<b>Specify file and which Folder/Sequence to grade</b>
             </td>
           </tr>
           <tr bgcolor="#ffffe6">
-            <td>
-               Sequence to grade: $sequence_selector
-	    </td>
+            <td> Sequence to grade: </td><td> $sequence_selector </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td> Filename of scoring office file: </td><td> $file_selector </td>
           </tr>
           <tr bgcolor="#ffffe6">
+            <td> Format of data file: </td><td> $format_selector </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td> Saved CODEs to validate against: </td><td> $CODE_selector</td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+            <td> Each CODE is only to be used once:</td><td> $CODE_unique </td>
+          </tr>
+          <tr bgcolor="#ffffe6">
+	    <td> Options: </td>
             <td>
-		Filename of scoring office file: $file_selector
+	       <label><input type="checkbox" name="scantron_options_redo" value="redo_skipped"/> Do only previously skipped records</label> <br />
+               <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all exisiting corrections</label>
 	    </td>
           </tr>
           <tr bgcolor="#ffffe6">
+            <td colspan="2">
+              <input type="submit" value="Grading: Validate Scantron Records" />
+            </td>
+          </tr>
+        </table>
+       </td>
+     </form>
+    </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>
-              Format of data file: $format_selector
-	    </td>
+              &nbsp;<b>Specify a Scantron data file to upload.</b>
+            </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>
+SCANTRONFORM
+    my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+    my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
+    $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
+                <input name='courseid' type='hidden' value='$cnum' />
+                <input name='domainid' type='hidden' value='$cdom' />
+                <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
+
+        $r->print(<<SCANTRONFORM);
+            </td>
           </tr>
         </table>
       </td>
     </tr>
+SCANTRONFORM
+    }
+    $r->print(<<SCANTRONFORM);
+    <tr>
+      <form action='/adm/grades' name='scantron_download'>
+        <td bgcolor="#777777">
+          <input type="hidden" name="command" value="scantron_download" />
+          <table width="100%" border="0">
+            <tr bgcolor="#e6ffff">
+              <td colspan="2">
+                &nbsp;<b>Download a scoring office file</b>
+              </td>
+            </tr>
+            <tr bgcolor="#ffffe6">
+              <td> Filename of scoring office file: </td><td> $file_selector </td>
+            </tr>
+            <tr bgcolor="#ffffe6">
+              <td colspan="2">
+                <input type="submit" value="Show List of Files" />
+              </td>
+            </tr>
+          </table>
+        </td>
+      </form>
+    </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 {
@@ -3508,7 +4071,7 @@ sub scantron_fixup_scanline {
     my ($scantron_config,$scan_data,$line,$whichline,$field,$args)=@_;
     if ($field eq 'ID') {
 	if (length($args->{'newid'}) > $$scantron_config{'IDlength'}) {
-	    return ($line,1,'New value to large');
+	    return ($line,1,'New value too large');
 	}
 	if (length($args->{'newid'}) < $$scantron_config{'IDlength'}) {
 	    $args->{'newid'}=sprintf('%-'.$$scantron_config{'IDlength'}.'s',
@@ -3520,6 +4083,21 @@ sub scantron_fixup_scanline {
 	    &scan_data($scan_data,"$whichline.user",
 		       $args->{'username'}.':'.$args->{'domain'});
 	}
+    } elsif ($field eq 'CODE') {
+	if ($args->{'CODE_ignore_dup'}) {
+	    &scan_data($scan_data,"$whichline.CODE_ignore_dup",'1');
+	}
+	&scan_data($scan_data,"$whichline.useCODE",'1');
+	if ($args->{'CODE'} ne 'use_unfound') {
+	    if (length($args->{'CODE'}) > $$scantron_config{'CODElength'}) {
+		return ($line,1,'New CODE value too large');
+	    }
+	    if (length($args->{'CODE'}) < $$scantron_config{'CODElength'}) {
+		$args->{'CODE'}=sprintf('%-'.$$scantron_config{'CODElength'}.'s',$args->{'CODE'});
+	    }
+	    substr($line,$$scantron_config{'CODEstart'}-1,
+		   $$scantron_config{'CODElength'})=$args->{'CODE'};
+	}
     } elsif ($field eq 'answer') {
 	my $length=$scantron_config->{'Qlength'};
 	my $off=$scantron_config->{'Qoff'};
@@ -3529,7 +4107,14 @@ sub scantron_fixup_scanline {
 	    &scan_data($scan_data,
 		       "$whichline.no_bubble.".$args->{'question'},'1');
 	} else {
-	    substr($answer,$args->{'response'},1)=$on;
+	    if ($on eq 'letter') {
+		my @alphabet=('A'..'Z');
+		$answer=$alphabet[$args->{'response'}];
+	    } elsif ($on eq 'number') {
+		$answer=$args->{'response'}+1;
+	    } else {
+		substr($answer,$args->{'response'},1)=$on;
+	    }
 	    &scan_data($scan_data,
 		       "$whichline.no_bubble.".$args->{'question'},undef,'1');
 	}
@@ -3541,7 +4126,7 @@ sub scantron_fixup_scanline {
 
 sub scan_data {
     my ($scan_data,$key,$value,$delete)=@_;
-    my $filename=$ENV{'form.scantron_selectfile'};
+    my $filename=$env{'form.scantron_selectfile'};
     if (defined($value)) {
 	$scan_data->{$filename.'_'.$key} = $value;
     }
@@ -3550,14 +4135,21 @@ sub scan_data {
 }
 
 sub scantron_parse_scanline {
-    my ($line,$whichline,$scantron_config,$scan_data)=@_;
+    my ($line,$whichline,$scantron_config,$scan_data,$justHeader)=@_;
     my %record;
     my $questions=substr($line,$$scantron_config{'Qstart'}-1);
     my $data=substr($line,0,$$scantron_config{'Qstart'}-1);
     if ($$scantron_config{'CODElocation'} ne 0) {
 	if ($$scantron_config{'CODElocation'} < 0) {
-	    $record{'scantron.CODE'}=substr($data,$$scantron_config{'CODEstart'}-1,
+	    $record{'scantron.CODE'}=substr($data,
+					    $$scantron_config{'CODEstart'}-1,
 					    $$scantron_config{'CODElength'});
+	    if (&scan_data($scan_data,"$whichline.useCODE")) {
+		$record{'scantron.useCODE'}=1;
+	    }
+	    if (&scan_data($scan_data,"$whichline.CODE_ignore_dup")) {
+		$record{'scantron.CODE_ignore_dup'}=1;
+	    }
 	} else {
 	    #FIXME interpret first N questions
 	}
@@ -3573,6 +4165,8 @@ sub scantron_parse_scanline {
     $record{'scantron.LastName'}=
 	substr($data,$$scantron_config{'LastName'}-1,
 	       $$scantron_config{'LastNamelength'});
+    if ($justHeader) { return \%record; }
+
     my @alphabet=('A'..'Z');
     my $questnum=0;
     while ($questions) {
@@ -3580,25 +4174,57 @@ 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,-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);
- 	    }
+	if ($$scantron_config{'Qon'} eq 'letter') {
+	    if ($currentquest eq '?') {
+		push(@{$record{'scantron.doubleerror'}},$questnum);
+		$record{"scantron.$questnum.answer"}='';
+	    } elsif (!$currentquest 
+		     || $currentquest eq $$scantron_config{'Qoff'}
+		     || $currentquest !~ /^[A-Z]$/) {
+		$record{"scantron.$questnum.answer"}='';
+		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+		    push(@{$record{"scantron.missingerror"}},$questnum);
+		}
+	    } else {
+		$record{"scantron.$questnum.answer"}=$currentquest;
+	    }
+	} elsif ($$scantron_config{'Qon'} eq 'number') {
+	    if ($currentquest eq '?') {
+		push(@{$record{'scantron.doubleerror'}},$questnum);
+		$record{"scantron.$questnum.answer"}='';
+		} elsif (!$currentquest 
+			 || $currentquest eq $$scantron_config{'Qoff'} 
+			 || $currentquest !~ /^\d$/) {
+		$record{"scantron.$questnum.answer"}='';
+		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+		    push(@{$record{"scantron.missingerror"}},$questnum);
+		}
+	    } else {
+		$record{"scantron.$questnum.answer"}=
+		    $alphabet[$currentquest-1];
+	    }
 	} else {
-	    $record{"scantron.$questnum.answer"}=$alphabet[length($array[0])];
+	    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'}},$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);
+		}
+	    }
 	}
- 	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;
@@ -3628,96 +4254,225 @@ sub scantron_find_student {
 
 sub scantron_filter {
     my ($curres)=@_;
-    if (ref($curres) && $curres->is_problem() && !$curres->randomout) {
+                        # randomout is dysfunctional at best for this purpose
+    if (ref($curres) && $curres->is_problem()) { #&& !$curres->randomout) {
 	return 1;
     }
     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_validate_file {
-    my ($r) = @_;
-}
-
 sub scantron_process_corrections {
     my ($r) = @_;
-    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    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 $which=$env{'form.scantron_line'};
+    my $line=&scantron_get_line($scanlines,$scan_data,$which);
     my ($skip,$err,$errmsg);
-    if ($ENV{'form.scantron_skip_record'}) {
+    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'};
+    } 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'})) {
+				    'username'=>$env{'form.scantron_username'},
+				    'domain'=>$env{'form.scantron_domain'}});
+    } elsif ($env{'form.scantron_corrections'} =~ /^(duplicate|incorrect)CODE$/) {
+	my $resolution=$env{'form.scantron_CODE_resolution'};
+	my $newCODE;
+	my %args;
+	if      ($resolution eq 'use_unfound') {
+	    $newCODE='use_unfound';
+	} elsif ($resolution eq 'use_found') {
+	    $newCODE=$env{'form.scantron_CODE_selectedvalue'};
+	} elsif ($resolution eq 'use_typed') {
+	    $newCODE=$env{'form.scantron_CODE_newvalue'};
+	} elsif ($resolution =~ /^use_closest_(\d+)/) {
+	    $newCODE=$env{"form.scantron_CODE_closest_$1"};
+	}
+	if ($env{'form.scantron_corrections'} eq 'duplicateCODE') {
+	    $args{'CODE_ignore_dup'}=1;
+	}
+	$args{'CODE'}=$newCODE;
+	($line,$err,$errmsg)=
+	    &scantron_fixup_scanline(\%scantron_config,$scan_data,$line,$which,
+				     'CODE',\%args);
+    } 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,
 					 $which,'answer',
 					 { 'question'=>$question,
-		       'response'=>$ENV{"form.scantron_correct_Q_$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_put_line($scanlines,$scan_data,$which,$line,$skip);
 	&scantron_putfile($scanlines,$scan_data);
     }
 }
 
+sub reset_skipping_status {
+    my ($scanlines,$scan_data)=&scantron_getfile();
+    &scan_data($scan_data,'remember_skipping',undef,1);
+    &scantron_putfile(undef,$scan_data);
+}
+
+sub allow_skipping {
+    my ($scan_data,$i)=@_;
+    my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
+    delete($remembered{$i});
+    &scan_data($scan_data,'remember_skipping',join(':',%remembered));
+}
+
+sub should_be_skipped {
+    my ($scan_data,$i)=@_;
+    if ($env{'form.scantron_options_redo'} !~ /^redo_/) {
+	# not redoing old skips
+	return 0;
+    }
+    my %remembered=split(':',&scan_data($scan_data,'remember_skipping'));
+    if (exists($remembered{$i})) { return 0; }
+    return 1;
+}
+
+sub remember_current_skipped {
+    my ($scanlines,$scan_data)=&scantron_getfile();
+    my %to_remember;
+    for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+	if ($scanlines->{'skipped'}[$i]) {
+	    $to_remember{$i}=1;
+	}
+    }
+    &Apache::lonnet::logthis('remembering '.join(':',%to_remember));
+    &scan_data($scan_data,'remember_skipping',join(':',%to_remember));
+    &scantron_putfile(undef,$scan_data);
+}
+
+sub check_for_error {
+    my ($r,$result)=@_;
+    if ($result ne 'ok' && $result ne 'not_found' ) {
+	$r->print("An error occured ($result) when trying to Remove the existing corrections.");
+    }
+}
+
+sub scantron_warning_screen {
+    my ($button_text)=@_;
+    my $title=&Apache::lonnet::gettitle($env{'form.selectpage'});
+    return (<<STUFF);
+<p>
+<font color="red">Please double check the information
+                 below before clicking on '$button_text'</font>
+</p>
+<table>
+<tr><td><b>Sequence To be Graded:</b></td><td>$title</td></tr>
+<tr><td><b>Data File that will be used:</b></td><td><tt>$env{'form.scantron_selectfile'}</tt></td></tr>
+</table>
+</font>
+<br />
+<p> If this information is correct, please click on '$button_text'.</p>
+<p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
+
+<br />
+STUFF
+}
+
+sub scantron_do_warning {
+    my ($r)=@_;
+    my ($symb,$url)=&get_symb_and_url($r);
+    if (!$symb) {return '';}
+    my $default_form_data=&defaultFormData($symb,$url);
+    $r->print(&scantron_form_start().$default_form_data);
+    if ( $env{'form.selectpage'} eq '' ||
+	 $env{'form.scantron_selectfile'} eq '' ||
+	 $env{'form.scantron_format'} eq '' ) {
+	$r->print("<p>You have forgetten to specify some information. Please go Back and try again.</p>");
+	if ( $env{'form.selectpage'} eq '') {
+	    $r->print('<p><font color="red">You have not selected a Sequence to grade</font></p>');
+	} 
+	if ( $env{'form.scantron_selectfile'} eq '') {
+	    $r->print('<p><font color="red">You have not selected a file that contains the student\'s response data.</font></p>');
+	} 
+	if ( $env{'form.scantron_format'} eq '') {
+	    $r->print('<p><font color="red">You have not selected a the format of the student\'s response data.</font></p>');
+	} 
+    } else {
+	my $warning=&scantron_warning_screen('Grading: Validate Records');
+	$r->print(<<STUFF);
+$warning
+<input type="submit" name="submit" value="Grading: Validate Records" />
+<input type="hidden" name="command" value="scantron_validate" />
+STUFF
+    }
+    $r->print("</form><br />".&show_grading_menu_form($symb,$url)."</body></html>");
+    return '';
+}
+
+sub scantron_form_start {
+    my ($max_bubble)=@_;
+    my $result= <<SCANTRONFORM;
+<form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
+  <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="$max_bubble" />
+  <input type="hidden" name="scantron_CODElist" value="$env{'form.scantron_CODElist'}" />
+  <input type="hidden" name="scantron_CODEunique" value="$env{'form.scantron_CODEunique'}" />
+  <input type="hidden" name="scantron_options_redo" value="$env{'form.scantron_options_redo'}" />
+  <input type="hidden" name="scantron_options_ignore" value="$env{'form.scantron_options_ignore'}" />
+SCANTRONFORM
+    return $result;
+}
 
 sub scantron_validate_file {
     my ($r) = @_;
     my ($symb,$url)=&get_symb_and_url($r);
     if (!$symb) {return '';}
     my $default_form_data=&defaultFormData($symb,$url);
+    
+    # do the detection of only doing skipped records first befroe we delete
+    # them  when doing the corrections reset
+    if ($env{'form.scantron_options_redo'} ne 'redo_skipped_ready') {
+	&reset_skipping_status();
+    }
+    if ($env{'form.scantron_options_redo'} eq 'redo_skipped') {
+	&remember_current_skipped();
+	&scantron_remove_file('skipped');
+	$env{'form.scantron_options_redo'}='redo_skipped_ready';
+    }
 
-    if ($ENV{'form.scantron_corrections'}) {
+    if ($env{'form.scantron_options_ignore'} eq 'ignore_corrections') {
+	&check_for_error($r,&scantron_remove_file('corrected'));
+	&check_for_error($r,&scantron_remove_file('skipped'));
+	&check_for_error($r,&scantron_remove_scan_data());
+	$env{'form.scantron_options_ignore'}='done';
+    }
+
+    if ($env{'form.scantron_corrections'}) {
 	&scantron_process_corrections($r);
     }
+    $r->print("<p>Gathering neccessary info.</p>");$r->rflush();
     #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="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
+    my $max_bubble=&scantron_get_maxbubble($r);
+    my $result=&scantron_form_start($max_bubble).$default_form_data;
     $r->print($result);
     
     my @validate_phases=( 'ID',
 			  'CODE',
 			  'doublebubble',
 			  'missingbubbles');
-    if (!$ENV{'form.validatepass'}) {
-	$ENV{'form.valiadatepass'} = 0;
+    if (!$env{'form.validatepass'}) {
+	$env{'form.validatepass'} = 0;
     }
-    my $currentphase=$ENV{'form.valiadatepass'};
+    my $currentphase=$env{'form.validatepass'};
 
-    if ($ENV{'form.scantron_selectfile'}=~m-^/-) {
-	#first pass copy file to classdir
-	
-    }
     my $stop=0;
     while (!$stop && $currentphase < scalar(@validate_phases)) {
 	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
@@ -3729,9 +4484,14 @@ SCANTRONFORM
 	}
     }
     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" />');
+	my $warning=&scantron_warning_screen('Start Grading');
+	$r->print(<<STUFF);
+Validation process complete.<br />
+$warning
+<input type="submit" name="submit" value="Start Grading" />
+<input type="hidden" name="command" value="scantron_process" />
+STUFF
+
     } else {
 	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
 	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
@@ -3747,38 +4507,69 @@ SCANTRONFORM
     return '';
 }
 
+sub scantron_remove_file {
+    my ($which)=@_;
+    my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $file='scantron_';
+    if ($which eq 'corrected' || $which eq 'skipped') {
+	$file.=$which.'_';
+    } else {
+	return 'refused';
+    }
+    $file.=$env{'form.scantron_selectfile'};
+    return &Apache::lonnet::removeuserfile($cname,$cdom,$file);
+}
+
+sub scantron_remove_scan_data {
+    my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my @keys=&Apache::lonnet::getkeys('nohist_scantrondata',$cdom,$cname);
+    my @todelete;
+    my $filename=$env{'form.scantron_selectfile'};
+    foreach my $key (@keys) {
+	if ($key=~/^\Q$filename\E_/) {
+	    if ($env{'form.scantron_options_redo'} eq 'redo_skipped_ready' &&
+		$key=~/remember_skipping/) {
+		next;
+	    }
+	    push(@todelete,$key);
+	}
+    }
+    my $result;
+    if (@todelete) {
+	$result=&Apache::lonnet::del('nohist_scantrondata',\@todelete,$cdom,$cname);
+    }
+    return $result;
+}
+
 sub scantron_getfile {
-    #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'};
+    #FIXME really would prefer a scantron directory
+    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
-	#FIXME when replicating strip CRLF to LF or CR to LF
-    }
+		       'scantron_orig_'.$env{'form.scantron_selectfile'});
     my %scanlines;
     $scanlines{'orig'}=[(split("\n",$lines,-1))];
     my $temp=$scanlines{'orig'};
     $scanlines{'count'}=$#$temp;
 
     $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
-		       'scantron_corrected_'.$ENV{'form.scantron_selectfile'});
+		       'scantron_corrected_'.$env{'form.scantron_selectfile'});
     if ($lines eq '-1') {
 	$scanlines{'corrected'}=[];
     } else {
 	$scanlines{'corrected'}=[(split("\n",$lines,-1))];
     }
     $lines=&Apache::lonnet::getfile('/uploaded/'.$cdom.'/'.$cname.'/'.
-		       'scantron_skipped_'.$ENV{'form.scantron_selectfile'});
+		       'scantron_skipped_'.$env{'form.scantron_selectfile'});
     if ($lines eq '-1') {
 	$scanlines{'skipped'}=[];
     } else {
 	$scanlines{'skipped'}=[(split("\n",$lines,-1))];
     }
-    my @tmp=&Apache::lonnet::dump('scantrondata',$cdom,$cname);
+    my @tmp=&Apache::lonnet::dump('nohist_scantrondata',$cdom,$cname);
     if ($tmp[0] =~ /^(error:|no_such_host)/) { @tmp=(); }
     my %scan_data = @tmp;
     return (\%scanlines,\%scan_data);
@@ -3786,44 +4577,57 @@ sub scantron_getfile {
 
 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);
+    my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    $env{'form.sillywaytopassafilearound'}=$contents;
+    &Apache::lonnet::finishuserfileupload($docuname,$docudom,'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_';
+    #FIXME really would prefer a scantron directory
+    my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    if ($scanlines) {
+	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);
+#		    $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('nohist_scantrondata',$scan_data,$cdom,$cname);
 }
 
 sub scantron_get_line {
-    my ($scanlines,$i)=@_;
-    if ($scanlines->{'skipped'}[$i]) {return undef;}
+    my ($scanlines,$scan_data,$i)=@_;
+    if (&should_be_skipped($scan_data,$i)) { return undef; }
+    if ($scanlines->{'skipped'}[$i]) { return undef; }
     if ($scanlines->{'corrected'}[$i]) {return $scanlines->{'corrected'}[$i];}
     return $scanlines->{'orig'}[$i]; 
 }
 
+sub get_todo_count {
+    my ($scanlines,$scan_data)=@_;
+    my $count=0;
+    for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+	my $line=&scantron_get_line($scanlines,$scan_data,$i);
+	if ($line=~/^[\s\cz]*$/) { next; }
+	$count++;
+    }
+    return $count;
+}
+
 sub scantron_put_line {
-    my ($scanlines,$i,$newline,$skip)=@_;
+    my ($scanlines,$scan_data,$i,$newline,$skip)=@_;
     if ($skip) {
 	$scanlines->{'skipped'}[$i]=$newline;
+	&allow_skipping($scan_data,$i);
 	return;
     }
     $scanlines->{'corrected'}[$i]=$newline;
@@ -3837,12 +4641,12 @@ sub scantron_validate_ID {
     my %idmap=&username_to_idmap($classlist);
 
     #get scantron line setup
-    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    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);
+	my $line=&scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
 						 $scan_data);
@@ -3856,13 +4660,13 @@ sub scantron_validate_ID {
 	    if ($found{'ids'}{$found}) {
 		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
 					 $line,'duplicateID',$found);
-		return(1);
+		return(1,$currentphase);
 	    } elsif ($found{'usernames'}{$username}) {
 		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
 					 $line,'duplicateID',$username);
-		return(1);
+		return(1,$currentphase);
 	    }
-	    #FIXME store away line we prviously saw the ID on to use above
+	    #FIXME store away line we previously saw the ID on to use above
 	    $found{'ids'}{$found}++;
 	    $found{'usernames'}{$username}++;
 	} else {
@@ -3872,18 +4676,18 @@ sub scantron_validate_ID {
 		    &scantron_get_correction($r,$i,$scan_record,
 					     \%scantron_config,
 					     $line,'duplicateID',$username);
-		    return(1);
+		    return(1,$currentphase);
 		} elsif (!defined($username)) {
 		    &scantron_get_correction($r,$i,$scan_record,
 					     \%scantron_config,
 					     $line,'incorrectID');
-		    return(1);
+		    return(1,$currentphase);
 		}
 		$found{'usernames'}{$username}++;
 	    } else {
 		&scantron_get_correction($r,$i,$scan_record,\%scantron_config,
 					 $line,'incorrectID');
-		return(1);
+		return(1,$currentphase);
 	    }
 	}
     }
@@ -3898,7 +4702,7 @@ sub scantron_get_correction {
 #to show both the current line and the previous one and allow skipping
 #the previous one or the current one
 
-    $r->print("<p>An error was detected ($error) ");
+    $r->print("<p><b>An error was detected ($error)</b>");
     if ( defined($$scan_record{'scantron.PaperID'}) ) {
 	$r->print(" for PaperID <tt>".
 		  $$scan_record{'scantron.PaperID'}."</tt> \n");
@@ -3906,19 +4710,21 @@ sub scantron_get_correction {
 	$r->print(" in scanline $i <pre>".
 		  $line."</pre> \n");
     }
+    my $message="<p>The ID on the form is  <tt>".
+	$$scan_record{'scantron.ID'}."</tt><br />\n".
+	"The name on the paper is ".
+	$$scan_record{'scantron.LastName'}.",".
+	$$scan_record{'scantron.FirstName'}."</p>";
+
     $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') {
+	if ($error eq 'incorrectID') {
 	    $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>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($message);
 	$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
@@ -3927,14 +4733,64 @@ sub scantron_get_correction {
 				       'scantron_username','scantron_domain'));
 	$r->print(": <input type='text' name='scantron_username' value='' />");
 	$r->print("\n@".
-		 &Apache::loncommon::select_dom_form(undef,'scantron_domain'));
+		 &Apache::loncommon::select_dom_form($env{'request.role.domain'},'scantron_domain'));
 
 	$r->print('</li>');
+    } elsif ($error =~ /CODE$/) {
+	if ($error eq 'incorrectCODE') {
+	    $r->print("</p><p>The encoded CODE is not in the list of possible CODEs</p>\n");
+	} elsif ($error eq 'duplicateCODE') {
+	    $r->print("</p><p>The encoded CODE has also been used by a previous paper ".join(', ',@{$arg}).", and CODEs are supposed to be unique</p>\n");
+	}
+	$r->print("<p>The CODE on the form is  <tt>'".
+		  $$scan_record{'scantron.CODE'}."'</tt><br />\n");
+	$r->print($message);
+	$r->print("<p>How should I handle this? <br /> \n");
+	$r->print("\n<br /> ");
+	my $i=0;
+	if ($error eq 'incorrectCODE' 
+	    && $$scan_record{'scantron.CODE'}=~/\S/ ) {
+	    my ($max,$closest)=&scantron_get_closely_matching_CODEs($arg,$$scan_record{'scantron.CODE'});
+	    foreach my $testcode (@{$closest}) {
+		my $checked='';
+		if (!$i) { $checked=' checked="on" '; }
+		$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked /> Use the similar CODE <b><tt>".$testcode."</tt></b> instead.</label><input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
+		$r->print("\n<br />");
+		$i++;
+	    }
+	}
+	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
+	    my $checked; if (!$i) { $checked=' checked="on" '; }
+	    $r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked /> Use the CODE <b><tt>".$$scan_record{'scantron.CODE'}."</tt></b> that is was on the paper, ignoring the error.</label>");
+	    $r->print("\n<br />");
+	}
+
+	$r->print(<<ENDSCRIPT);
+<script type="text/javascript">
+function change_radio(field) {
+    var slct=document.scantronupload.scantron_CODE_resolution;
+    var i;
+    for (i=0;i<slct.length;i++) {
+        if (slct[i].value==field) { slct[i].checked=true; }
+    }
+}
+</script>
+ENDSCRIPT
+	my $href="/adm/pickcode?".
+	   "form=".&Apache::lonnet::escape("scantronupload").
+	   "&scantron_format=".&Apache::lonnet::escape($env{'form.scantron_format'}).
+	   "&scantron_CODElist=".&Apache::lonnet::escape($env{'form.scantron_CODElist'}).
+	   "&curCODE=".&Apache::lonnet::escape($$scan_record{'scantron.CODE'}).
+	   "&scantron_selectfile=".&Apache::lonnet::escape($env{'form.scantron_selectfile'});
+	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_found' /> <a target='_blank' href='$href'>Select</a> a CODE from the list of all CODEs and use it.</label> Selected CODE is <input readonly='true' type='text' size='8' name='scantron_CODE_selectedvalue' onfocus=\"javascript:change_radio('use_found')\" onchange=\"javascript:change_radio('use_found')\" />");
+	$r->print("\n<br />");
+	$r->print("<label><input type='radio' name='scantron_CODE_resolution' value='use_typed' /> Use </label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" /> as the CODE.");
+	$r->print("\n<br /><br />");
     } elsif ($error eq 'doublebubble') {
-#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($message);
 	$r->print("<p>Please indicate which bubble should be used for grading</p>");
 	foreach my $question (@{$arg}) {
 	    my $selected=$$scan_record{"scantron.$question.answer"};
@@ -3942,6 +4798,7 @@ sub scantron_get_correction {
 	}
     } elsif ($error eq 'missingbubble') {
 	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+	$r->print($message);
 	$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="'.
@@ -3960,27 +4817,107 @@ sub scantron_get_correction {
 sub scantron_bubble_selector {
     my ($r,$scan_config,$quest,@selected)=@_;
     my $max=$$scan_config{'Qlength'};
+
+    my $scmode=$$scan_config{'Qon'};
+    if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }	     
+
     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">');
+	$r->print("\n".'<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>');
+    $r->print('</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("\n".
+		  '<td><label><input type="radio" name="scantron_correct_Q_'.
+		  $quest.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
     }
-    $r->print('<td><input type="radio" name="scantron_correct_Q_'.$quest.
-	      '" value="none" /> No bubble </td>');
+    $r->print('<td><label><input type="radio" name="scantron_correct_Q_'.
+	      $quest.'" value="none" /> No bubble </label></td>');
     $r->print('</tr></table>');
 }
 
+sub num_matches {
+    my ($orig,$code) = @_;
+    my @code=split(//,$code);
+    my @orig=split(//,$orig);
+    my $same=0;
+    for (my $i=0;$i<scalar(@code);$i++) {
+	if ($code[$i] eq $orig[$i]) { $same++; }
+    }
+    return $same;
+}
+
+sub scantron_get_closely_matching_CODEs {
+    my ($allcodes,$CODE)=@_;
+    my @CODEs;
+    foreach my $testcode (sort(keys(%{$allcodes}))) {
+	push(@{$CODEs[&num_matches($CODE,$testcode)]},$testcode);
+    }
+
+    return ($#CODEs,$CODEs[-1]);
+}
+
+sub get_codes {
+    my $old_name=$env{'form.scantron_CODElist'};
+    my $cdom =$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $cnum =$env{'course.'.$env{'request.course.id'}.'.num'};
+    my %result=&Apache::lonnet::get('CODEs',[$old_name],$cdom,$cnum);
+    my %allcodes=map {(&Apache::lonprintout::num_to_letters($_),1)} split(',',$result{$old_name});
+    return %allcodes;
+}
+
 sub scantron_validate_CODE {
     my ($r,$currentphase) = @_;
-    #FIXME doesn't do anything yet
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
+    if ($scantron_config{'CODElocation'} &&
+	$scantron_config{'CODEstart'} &&
+	$scantron_config{'CODElength'}) {
+	if (!defined($env{'form.scantron_CODElist'})) {
+	    &FIXME_blow_up()
+	}
+    } else {
+	return (0,$currentphase+1);
+    }
+    
+    my %usedCODEs;
+
+    my %allcodes=&get_codes();
+
+    my ($scanlines,$scan_data)=&scantron_getfile();
+    for (my $i=0;$i<=$scanlines->{'count'};$i++) {
+	my $line=&scantron_get_line($scanlines,$scan_data,$i);
+	if ($line=~/^[\s\cz]*$/) { next; }
+	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
+						 $scan_data);
+	my $CODE=$$scan_record{'scantron.CODE'};
+	my $error=0;
+	if (!&Apache::lonnet::validCODE($CODE)) {
+	    &scantron_get_correction($r,$i,$scan_record,
+				     \%scantron_config,
+				     $line,'incorrectCODE',\%allcodes);
+	    return(1,$currentphase);
+	}
+	if (%allcodes && !exists($allcodes{$CODE}) 
+	    && !$$scan_record{'scantron.useCODE'}) {
+	    &scantron_get_correction($r,$i,$scan_record,
+				     \%scantron_config,
+				     $line,'incorrectCODE',\%allcodes);
+	    return(1,$currentphase);
+	}
+	if (exists($usedCODEs{$CODE}) 
+	    && $env{'form.scantron_CODEunique'} eq 'yes'
+	    && !$$scan_record{'scantron.CODE_ignore_dup'}) {
+	    &scantron_get_correction($r,$i,$scan_record,
+				     \%scantron_config,
+				     $line,'duplicateCODE',$usedCODEs{$CODE});
+	    return(1,$currentphase);
+	}
+	push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
+    }
     return (0,$currentphase+1);
 }
 
@@ -3991,10 +4928,10 @@ sub scantron_validate_doublebubble {
     my %idmap=&username_to_idmap($classlist);
 
     #get scantron line setup
-    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    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);
+	my $line=&scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
 						 $scan_data);
@@ -4007,6 +4944,31 @@ sub scantron_validate_doublebubble {
     return (0,$currentphase+1);
 }
 
+sub scantron_get_maxbubble {
+    my ($r)=@_;
+    if (defined($env{'form.scantron_maxbubble'}) &&
+	$env{'form.scantron_maxbubble'}) {
+	return $env{'form.scantron_maxbubble'};
+    }
+    my $navmap=Apache::lonnavmaps::navmap->new();
+    my (undef,undef,$sequence)=
+	&Apache::lonnet::decode_symb($env{'form.selectpage'});
+    my $map=$navmap->getResourceByUrl($sequence);
+    my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+    &Apache::lonnet::delenv('form.counter');
+    foreach my $resource (@resources) {
+	my $result=&Apache::lonnet::ssi($resource->src().'?symb='.&Apache::lonnet::escape($resource->symb()));
+    }
+    &Apache::lonnet::delenv('scantron\.');
+    my $envfile=$env{'user.environment'};
+    $envfile=~/\/([^\/]+)\.id$/;
+    $envfile=$1;
+    &Apache::lonnet::transfer_profile_to_env($r->dir_config('lonIDsDir'),
+					     $envfile);
+    $env{'form.scantron_maxbubble'}=$env{'form.counter'}-1;
+    return $env{'form.scantron_maxbubble'};
+}
+
 sub scantron_validate_missingbubbles {
     my ($r,$currentphase) = @_;
     #get student info
@@ -4014,12 +4976,12 @@ sub scantron_validate_missingbubbles {
     my %idmap=&username_to_idmap($classlist);
 
     #get scantron line setup
-    my %scantron_config=&get_scantron_config($ENV{'form.scantron_format'});
+    my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
-    my $max_bubble=$ENV{'form.scantron_maxbubble'};
+    my $max_bubble=&scantron_get_maxbubble();
     if (!$max_bubble) { $max_bubble=2**31; }
     for (my $i=0;$i<=$scanlines->{'count'};$i++) {
-	my $line=&scantron_get_line($scanlines,$i);
+	my $line=&scantron_get_line($scanlines,$scan_data,$i);
 	if ($line=~/^[\s\cz]*$/) { next; }
 	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
 						 $scan_data);
@@ -4041,12 +5003,12 @@ sub scantron_validate_missingbubbles {
 
 sub scantron_process_students {
     my ($r) = @_;
-    my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($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 %scantron_config=&get_scantron_config($env{'form.scantron_format'});
     my ($scanlines,$scan_data)=&scantron_getfile();
     my $classlist=&Apache::loncoursedata::get_classlist();
     my %idmap=&username_to_idmap($classlist);
@@ -4064,19 +5026,25 @@ SCANTRONFORM
     my @delayqueue;
     my %completedstudents;
     
+    my $count=&get_todo_count($scanlines,$scan_data);
     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
- 				    'Scantron Progress',$scanlines->{'count'});
+ 				    'Scantron Progress',$count,
+				    'inline',undef,'scantronupload');
     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
 					  'Processing first student');
     my $start=&Time::HiRes::time();
     my $i=-1;
-    my ($uname,$udom);
+    my ($uname,$udom,$started);
     while ($i<$scanlines->{'count'}) {
  	($uname,$udom)=('','');
  	$i++;
- 	my $line=&scantron_get_line($scanlines,$i);
-#	$r->print('<pre>line is'.$line.'</pre>');
+ 	my $line=&scantron_get_line($scanlines,$scan_data,$i);
  	if ($line=~/^[\s\cz]*$/) { next; }
+	if ($started) {
+	    &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
+						     'last student');
+	}
+	$started=1;
  	my $scan_record=&scantron_parse_scanline($line,$i,\%scantron_config,
  						 $scan_data);
  	unless ($uname=&scantron_find_student($scan_record,$scan_data,
@@ -4090,87 +5058,56 @@ SCANTRONFORM
  				'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=0;
+	
+	my $i=0;
 	foreach my $resource (@resources) {
 	    $i++;
-	    my $result=&Apache::lonnet::ssi($resource->src(),
-				 ('submitted'     =>'scantron',
-				  'grade_target'  =>'grade',
-				  'grade_username'=>$uname,
-				  '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;}
+	    my %form=('submitted'     =>'scantron',
+		      'grade_target'  =>'grade',
+		      'grade_username'=>$uname,
+		      'grade_domain'  =>$udom,
+		      'grade_courseid'=>$env{'request.course.id'},
+		      'grade_symb'    =>$resource->symb());
+	    if (exists($scan_record->{'scantron.CODE'}) &&
+		$scan_record->{'scantron.CODE'}) {
+		$form{'CODE'}=$scan_record->{'scantron.CODE'};
+	    } else {
+		$form{'CODE'}='';
+	    }
+	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
+	    if ($result ne '') {
+		&Apache::lonnet::logthis("scantron grading error -> $result");
+		&Apache::lonnet::logthis("scantron grading error info name $uname domain $udom course $env{'request.course.id'} url ".$resource->src());
+	    }
+	    if (&Apache::loncommon::connection_aborted($r)) { last; }
 	}
 	$completedstudents{$uname}={'line'=>$line};
+	if (&Apache::loncommon::connection_aborted($r)) { last; }
     } continue {
 	&Apache::lonnet::delenv('form.counter');
 	&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>");
+#    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
-	
-    }
-    #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();
-    $r->print("<p>Done</p>");
+    $r->print("</form>");
     $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'}));
+    $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',
+							  'coursename');
+    my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
 						   'domainid');
+    my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
     $r->print(<<UPLOAD);
 <script type="text/javascript" language="javascript">
     function checkUpload(formname) {
@@ -4183,12 +5120,15 @@ sub scantron_upload_scantron_data {
 </script>
 
 <form enctype='multipart/form-data' action='/adm/grades' name='rules' method='post'>
-Course: <input name='courseid' type='text' />
-Domain: $domsel $select_link
-<br />
+$default_form_data
+<table>
+<tr><td>$select_link </td></tr>
+<tr><td>Course ID:   </td><td><input name='courseid' type='text' />  </td></tr>
+<tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
+<tr><td>Domain:      </td><td>$domsel                                </td></tr>
+<tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+</table>
 <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
@@ -4197,10 +5137,26 @@ UPLOAD
 
 sub scantron_upload_scantron_data_save {
     my($r)=@_;
-    $r->print("Doing upload to ".$ENV{'form.courseid'});
-    my $home=&Apache::lonnet::homeserver($ENV{'form.courseid'},
-					 $ENV{'form.domainid'});
-    my $fname=$ENV{'form.upfile.filename'};
+    my ($symb,$url)=&get_symb_and_url($r,1);
+    my $doanotherupload=
+	'<br /><form action="/adm/grades" method="post">'."\n".
+	'<input type="hidden" name="command" value="scantronupload" />'."\n".
+	'<input type="submit" name="submit" value="Do Another Upload" />'."\n".
+	'</form>'."\n";
+    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 />");
+	if ($symb) {
+	    $r->print(&show_grading_menu_form($symb,$url));
+	} else {
+	    $r->print($doanotherupload);
+	}
+	return '';
+    }
+    my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
+    $r->print("Doing upload to ".$coursedata{'description'}." <br />");
+    my $fname=$env{'form.upfile.filename'};
     #FIXME
     #copied from lonnet::userfileupload()
     #make that function able to target a specified course
@@ -4214,20 +5170,75 @@ sub scantron_upload_scantron_data_save {
     $fname=~s/[^\w\.\-]//g;
     # See if there is anything left
     unless ($fname) { return 'error: no uploaded file'; }
+    my $uploadedfile=$fname;
     $fname='scantron_orig_'.$fname;
-    &Apache::lonnet::logthis("fname is $fname");
-    $r->print(&Apache::lonnet::finishuserfileupload($ENV{'form.courseid'},
-						    $ENV{'form.domainid'},
-						    $home,'upfile',$fname));
+    if (length($env{'form.upfile'}) < 2) {
+	$r->print("<font color='red'>Error:</font> The file you attempted to upload, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>, contained no information. Please check that you entered the correct filename.");
+    } else {
+	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
+	if ($result =~ m|^/uploaded/|) {
+	    $r->print("<font color='green'>Success:</font> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+	} else {
+	    $r->print("<font color='red'>Error:</font> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
+	}
+    }
+    if ($symb) {
+	$r->print(&scantron_selectphase($r,$uploadedfile));
+    } else {
+	$r->print($doanotherupload);
+    }
     return '';
 }
 
+sub valid_file {
+    my ($requested_file)=@_;
+    foreach my $filename (sort(&scantron_filenames())) {
+	&Apache::lonnet::logthis("$requested_file  $filename");
+	if ($requested_file eq $filename) { return 1; }
+    }
+    return 0;
+}
+
+sub scantron_download_scantron_data {
+    my ($r)=@_;
+    my $default_form_data=&defaultFormData(&get_symb_and_url($r,1));
+    my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+    my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
+    my $file=$env{'form.scantron_selectfile'};
+    if (! &valid_file($file)) {
+	$r->print(<<ERROR);
+	<p>
+	    The requested file name was invalid.
+        </p>
+ERROR
+	$r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+	return;
+    }
+    my $orig='/uploaded/'.$cdom.'/'.$cname.'/scantron_orig_'.$file;
+    my $corrected='/uploaded/'.$cdom.'/'.$cname.'/scantron_corrected_'.$file;
+    my $skipped='/uploaded/'.$cdom.'/'.$cname.'/scantron_skipped_'.$file;
+    &Apache::lonnet::allowuploaded('/adm/grades',$orig);
+    &Apache::lonnet::allowuploaded('/adm/grades',$corrected);
+    &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
+    $r->print(<<DOWNLOAD);
+    <p>
+	<a href="$orig">Original</a> file as uploaded by the scantron office.
+    </p>
+    <p>
+	<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
+    </p>
+    <p>
+	<a href="$skipped">Skipped</a>, a file of records that were skipped.
+    </p>
+DOWNLOAD
+    $r->print(&show_grading_menu_form(&get_symb_and_url($r,1)));
+    return '';
+}
 
 #-------- end of section for handling grading scantron forms -------
 #
 #-------------------------------------------------------------------
 
-
 #-------------------------- Menu interface -------------------------
 #
 #--- Show a Grading Menu button - Calls the next routine ---
@@ -4236,7 +5247,7 @@ sub show_grading_menu_form {
     my $result.='<br /><form action="/adm/grades" method="post">'."\n".
 	'<input type="hidden" name="symb" value="'.$symb.'" />'."\n".
 	'<input type="hidden" name="url" value="'.$url.'" />'."\n".
-	'<input type="hidden" name="saveState"  value="'.$ENV{'form.saveState'}.'" />'."\n".
+	'<input type="hidden" name="saveState"  value="'.$env{'form.saveState'}.'" />'."\n".
 	'<input type="hidden" name="command" value="gradingmenu" />'."\n".
 	'<input type="submit" name="submit" value="Grading Menu" />'."\n".
 	'</form>'."\n";
@@ -4246,8 +5257,8 @@ sub show_grading_menu_form {
 # -- Retrieve choices for grading form
 sub savedState {
     my %savedState = ();
-    if ($ENV{'form.saveState'}) {
-	foreach (split(/:/,$ENV{'form.saveState'})) {
+    if ($env{'form.saveState'}) {
+	foreach (split(/:/,$env{'form.saveState'})) {
 	    my ($key,$value) = split(/=/,$_,2);
 	    $savedState{$key} = $value;
 	}
@@ -4280,6 +5291,7 @@ sub gradingmenu {
 	    if (!checkReceiptNo(formname,'notOK')) { return false;}
 	    formname.submit();
 	}
+	if (val < 7) formname.submit();
     }
 
     function checkReceiptNo(formname,nospace) {
@@ -4325,26 +5337,23 @@ 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";
 	}
     }
-    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</select> &nbsp; ';
+    $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="on"' : ''). '>all</option></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) && (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 '.
-	'<select name="submitonly">'.
+	($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" '.
@@ -4372,20 +5381,24 @@ GRADINGMENUJS
 
     $result.='<table width="100%" border=0>';
     $result.='<tr bgcolor="#ffffe6"><td>'.
-	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="Upload" />'.
-	' scores from file </td></tr>'."\n";
+	'<input type="button" onClick="javascript:checkChoice(this.form,\'3\',\'csvform\');" value="'.&mt('Upload').'" />'.
+	' '.&mt('scores from file').' </td></tr>'."\n";
 
     $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
 	'<input type="button" onClick="javascript:checkChoice(this.form,\'4\',\'scantron_selectphase\');'.
-	'" value="Grade" /> scantron forms</td></tr>'."\n";
+	'" value="'.&mt('Grade').'" /> scantron forms</td></tr>'."\n";
 
-    if ((&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) && ($symb)) {
+    if ((&Apache::lonnet::allowed('mgr',$env{'request.course.id'})) && ($symb)) {
 	$result.='<tr bgcolor="#ffffe6"valign="top"><td>'.
-	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="Verify" />'.
-	    ' submission Receipt no: '.unpack("%32C*",$Apache::lonnet::perlvar{'lonHostID'}).
+	    '<input type="button" onClick="javascript:checkChoice(this.form,\'5\',\'verify\');" value="'.&mt('Verify').'" />'.
+	    ' '.&mt('receipt').': '.
+	    &Apache::lonnet::recprefix($env{'request.course.id'}).
 	    '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')">'.
 	    '</td></tr>'."\n";
     } 
+    $result.='<tr bgcolor="#ffffe6"valign="top"><td colspan="2">'.
+	'<input type="button" onClick="javascript:this.form.action=\'/adm/helper/resettimes.helper\';this.form.submit();'.
+	'" value="'.&mt('Manage').'" /> access times.</td></tr>'."\n";
 
     $result.='</form></td></tr></table>'."\n".
 	'</td></tr></table>'."\n".
@@ -4397,7 +5410,7 @@ sub handler {
     my $request=$_[0];
 
     undef(%perm);
-    if ($ENV{'browser.mathml'}) {
+    if ($env{'browser.mathml'}) {
 	&Apache::loncommon::content_type($request,'text/xml');
     } else {
 	&Apache::loncommon::content_type($request,'text/html');
@@ -4405,8 +5418,8 @@ sub handler {
     $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 $url=$env{'form.url'};
+    my $symb=$env{'form.symb'};
     my @commands=&Apache::loncommon::get_env_multiple('form.command');
     my $command=$commands[0];
     if ($#commands > 0) {
@@ -4414,16 +5427,16 @@ sub handler {
     }
     if (!$url) {
 	my ($temp1,$temp2);
-	($temp1,$temp2,$ENV{'form.url'})=&Apache::lonnet::decode_symb($symb);
-	$url = $ENV{'form.url'};
+	($temp1,$temp2,$env{'form.url'})=&Apache::lonnet::decode_symb($symb);
+	$url = $env{'form.url'};
     }
     &send_header($request);
     if ($url eq '' && $symb eq '' && $command eq '') {
-	if ($ENV{'user.adv'}) {
-	    if (($ENV{'form.codeone'}) && ($ENV{'form.codetwo'}) &&
-		($ENV{'form.codethree'})) {
-		my $token=$ENV{'form.codeone'}.'*'.$ENV{'form.codetwo'}.'*'.
-		    $ENV{'form.codethree'};
+	if ($env{'user.adv'}) {
+	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
+		($env{'form.codethree'})) {
+		my $token=$env{'form.codeone'}.'*'.$env{'form.codetwo'}.'*'.
+		    $env{'form.codethree'};
 		my ($tsymb,$tuname,$tudom,$tcrsid)=
 		    &Apache::lonnet::checkin($token);
 		if ($tsymb) {
@@ -4445,22 +5458,22 @@ sub handler {
 	    }
 	}
     } else {
-	if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}))) {
-	    if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
-		$perm{'vgr_section'}=$ENV{'request.course.sec'};
+	if (!($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+	    if ($perm{'vgr'}=&Apache::lonnet::allowed('vgr',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+		$perm{'vgr_section'}=$env{'request.course.sec'};
 	    } else {
 		delete($perm{'vgr'});
 	    }
 	}
-	if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}))) {
-	    if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}.'/'.$ENV{'request.course.sec'})) {
-		$perm{'mgr_section'}=$ENV{'request.course.sec'};
+	if (!($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$env{'request.course.id'}))) {
+	    if ($perm{'mgr'}=&Apache::lonnet::allowed('mgr',$env{'request.course.id'}.'/'.$env{'request.course.sec'})) {
+		$perm{'mgr_section'}=$env{'request.course.sec'};
 	    } else {
 		delete($perm{'mgr'});
 	    }
 	}
 	if ($command eq 'submission' && $perm{'vgr'}) {
-	    ($ENV{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
+	    ($env{'form.student'} eq '' ? &listStudents($request) : &submission($request,0,0));
 	} elsif ($command eq 'pickStudentPage' && $perm{'vgr'}) {
 	    &pickStudentPage($request);
 	} elsif ($command eq 'displayPage' && $perm{'vgr'}) {
@@ -4485,32 +5498,38 @@ sub handler {
 	    $request->print(&csvupload($request));
 	} elsif ($command eq 'csvuploadmap' && $perm{'mgr'} ) {
 	    $request->print(&csvuploadmap($request));
-	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'}) {
-	    if ($ENV{'form.associate'} ne 'Reverse Association') {
-		$request->print(&csvuploadassign($request));
+	} elsif ($command eq 'csvuploadoptions' && $perm{'mgr'}) {
+	    if ($env{'form.associate'} ne 'Reverse Association') {
+		$request->print(&csvuploadoptions($request));
 	    } else {
-		if ( $ENV{'form.upfile_associate'} ne 'reverse' ) {
-		    $ENV{'form.upfile_associate'} = 'reverse';
+		if ( $env{'form.upfile_associate'} ne 'reverse' ) {
+		    $env{'form.upfile_associate'} = 'reverse';
 		} else {
-		    $ENV{'form.upfile_associate'} = 'forward';
+		    $env{'form.upfile_associate'} = 'forward';
 		}
 		$request->print(&csvuploadmap($request));
 	    }
+	} elsif ($command eq 'csvuploadassign' && $perm{'mgr'} ) {
+	    $request->print(&csvuploadassign($request));
 	} 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_warning' && $perm{'mgr'}) {
+ 	    $request->print(&scantron_do_warning($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'})) {
- 	    $request->print(&scantron_upload_scantron_data($request));
- 
+ 		 (&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.role.domain'})||
+		  &Apache::lonnet::allowed('usc',$env{'request.course.id'}))) {
  	    $request->print(&scantron_upload_scantron_data_save($request));
+ 	} elsif ($command eq 'scantron_download' &&
+		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
+ 	    $request->print(&scantron_download_scantron_data($request));
 	} elsif ($command) {
 	    $request->print("Access Denied ($command)");
 	}
@@ -4533,8 +5552,7 @@ sub send_header {
 
 sub send_footer {
     my ($request)= @_;
-    $request->print('</body>');
-    $request->print(&Apache::lontexconvert::footer());
+    $request->print('</body></html>');
 }
 
 1;