--- loncom/homework/grades.pm	2007/01/04 16:50:02	1.387
+++ loncom/homework/grades.pm	2007/03/14 19:15:37	1.392
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.387 2007/01/04 16:50:02 raeburn Exp $
+# $Id: grades.pm,v 1.392 2007/03/14 19:15:37 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -117,8 +117,12 @@ sub response_type {
     my $navmap = Apache::lonnavmaps::navmap->new();
     my $res = $navmap->getBySymb($symb);
     my $partlist = $res->parts();
+    my %vPart = 
+	map { $_ => 1 } (&Apache::loncommon::get_env_multiple('form.vPart'));
     my (%response_types,%handgrade);
     foreach my $part (@{ $partlist }) {
+	next if (%vPart && !exists($vPart{$part}));
+
 	my @types = $res->responseType($part);
 	my @ids = $res->responseIds($part);
 	for (my $i=0; $i < scalar(@ids); $i++) {
@@ -599,7 +603,8 @@ sub verifyreceipt {
     my (undef,undef,$fullname) = &getclasslist('all','0');
     
     my $receiptparts=0;
-    if ($env{"course.$courseid.receiptalg"} eq 'receipt2') { $receiptparts=1; }
+    if ($env{"course.$courseid.receiptalg"} eq 'receipt2' ||
+	$env{"course.$courseid.receiptalg"} eq 'receipt3') { $receiptparts=1; }
     my $parts=['0'];
     if ($receiptparts) { ($parts)=&response_type($symb); }
     foreach (sort 
@@ -2537,7 +2542,7 @@ sub handback_files {
 		$message .= ' The returned file(s) are named: '. $file_msg;
 		$message .= " and can be found in your portfolio space.";
 		my $url = (&Apache::lonnet::decode_symb($symb))[2];
-		my $feedurl = &Apache::lonnet::declutter($url);
+		my $feedurl = &Apache::lonnet::clutter($url);
                 my $encrypturl=&Apache::lonnet::EXT('resource.0.encrypturl',
                                                     $symb,$domain,$stuname);
                 my ($baseurl,$showsymb);
@@ -2984,7 +2989,7 @@ sub viewgrades {
     }
     $result.='</table>'.'</td></tr></table>'.'</td></tr></table>'."\n".
 	'<input type="hidden" name="totalparts" value="'.$ctsparts.'" />';
-    $result.='<input type="button" value="Reset" '.
+    $result.='<input type="button" value="Revert to Default" '.
 	'onClick="javascript:resetEntry('.$ctsparts.');" TARGET=_self>';
 
     #table listing all the students in a section/class
@@ -4638,6 +4643,7 @@ sub scantron_fixup_scanline {
 		$answer=$alphabet[$args->{'response'}];
 	    } elsif ($on eq 'number') {
 		$answer=$args->{'response'}+1;
+		if ($answer == 10) { $answer = '0'; }
 	    } else {
 		substr($answer,$args->{'response'},1)=$on;
 	    }
@@ -4708,7 +4714,7 @@ sub scantron_parse_scanline {
 		|| $currentquest eq '*') {
 		push(@{$record{'scantron.doubleerror'}},$questnum);
 		$record{"scantron.$questnum.answer"}='';
-	    } elsif (!$currentquest 
+	    } elsif (!defined($currentquest)
 		     || $currentquest eq $$scantron_config{'Qoff'}
 		     || $currentquest !~ /^[A-Z]$/) {
 		$record{"scantron.$questnum.answer"}='';
@@ -4723,9 +4729,9 @@ sub scantron_parse_scanline {
 		|| $currentquest eq '*') {
 		push(@{$record{'scantron.doubleerror'}},$questnum);
 		$record{"scantron.$questnum.answer"}='';
-		} elsif (!$currentquest 
-			 || $currentquest eq $$scantron_config{'Qoff'} 
-			 || $currentquest !~ /^\d$/) {
+	    } elsif (!defined($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);