loncom/homework/grades.pm - diff

Return to grades.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/grades.pm between versions 1.491 and 1.548

-version 1.491, 2007/11/16 07:55:01
+version 1.548, 2009/01/16 10:59:52
  Line 26
  # http://www.lon-capa.org/
  #
  package Apache::grades;
  use strict;
  use Apache::style;
- Line 47  use LONCAPA;
+ Line 49  use LONCAPA;
  use POSIX qw(floor);
- my %perm=();
- my %bubble_lines_per_response = ();     # no. bubble lines for each response.
-                                    # index is "symb.part_id"
- my %first_bubble_line = ();	# First bubble line no. for each bubble.
- # Save and restore the bubble lines array to the form env.
- sub save_bubble_lines {
-     foreach my $line (keys(%bubble_lines_per_response)) {
- 	$env{"form.scantron.bubblelines.$line"}  = $bubble_lines_per_response{$line};
- 	$env{"form.scantron.first_bubble_line.$line"} =
- 	    $first_bubble_line{$line};
-     }
- }
- sub restore_bubble_lines {
+ my %perm=();
-     my $line = 0;
-     %bubble_lines_per_response = ();
-     while ($env{"form.scantron.bubblelines.$line"}) {
- 	my $value = $env{"form.scantron.bubblelines.$line"};
- 	$bubble_lines_per_response{$line} = $value;
- 	$first_bubble_line{$line}  =
- 	    $env{"form.scantron.first_bubble_line.$line"};
- 	$line++;
-     }
- }
- #  Given the parsed scanline, get the response for
+ #  These variables are used to recover from ssi errors
- #  'answer' number n:
- sub get_response_bubbles {
+ my $ssi_retries = 5;
-     my ($parsed_line, $response)  = @_;
+ my $ssi_error;
+ my $ssi_error_resource;
+ my $ssi_error_message;
-     my $bubble_line = $first_bubble_line{$response-1} +1;
+ sub ssi_with_retries {
-     my $bubble_lines= $bubble_lines_per_response{$response-1};
+     my ($resource, $retries, %form) = @_;
+     my ($content, $response) = &Apache::loncommon::ssi_with_retries($resource, $retries, %form);
-     my $selected = "";
+     if ($response->is_error) {
+ 	$ssi_error          = 1;
-     for (my $bline = 0; $bline < $bubble_lines; $bline++) {
+ 	$ssi_error_resource = $resource;
- 	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
+ 	$ssi_error_message  = $response->code . " " . $response->message;
- 	$bubble_line++;
      }
-     return $selected;
- }
- # ----- These first few routines are general use routines.----
- # Return the number of occurences of a pattern in a string.
+     return $content;
- sub occurence_count {
-     my ($string, $pattern) = @_;
-     my @matches = ($string =~ /$pattern/g);
-     return scalar(@matches);
  }
+ #
+ #  Prodcuces an ssi retry failure error message to the user:
+ #
+ sub ssi_print_error {
- # Take a string known to have digits and convert all the
+     my ($r) = @_;
- # digits into letters in the range J,A..I.
+     my $helpurl = &Apache::loncommon::top_nav_help('Helpdesk');
+     $r->print('
- sub digits_to_letters {
+ <br />
-     my ($input) = @_;
+ <h2>'.&mt('An unrecoverable network error occurred:').'</h2>
+ <p>
-     my @alphabet = ('J', 'A'..'I');
+ '.&mt('Unable to retrieve a resource from a server:').'<br />
+ '.&mt('Resource:').' '.$ssi_error_resource.'<br />
-     my @input    = split(//, $input);
+ '.&mt('Error:').' '.$ssi_error_message.'
-     my $output ='';
+ </p>
-     for (my $i = 0; $i < scalar(@input); $i++) {
+ <p>'.
- 	if ($input[$i] =~ /\d/) {
+ &mt('It is recommended that you try again later, as this error may mean the server was just temporarily unavailable, or is down for maintenance.').'<br />'.
- 	    $output .= $alphabet[$input[$i]];
+ &mt('If the error persists, please contact the [_1] for assistance.',$helpurl).
- 	} else {
+ '</p>');
- 	    $output .= $input[$i];
+     return;
- 	}
-     }
-     return $output;
  }
  #
- Line 239  sub showResourceInfo {
+ Line 202  sub showResourceInfo {
      my %resptype = ();
      my $hdgrade='no';
      my %partsseen;
-     foreach my $partID (sort keys(%$responseType)) {
+     foreach my $partID (sort(keys(%$responseType))) {
- 	foreach my $resID (sort keys(%{ $responseType->{$partID} })) {
+ 	foreach my $resID (sort(keys(%{ $responseType->{$partID} }))) {
  	    my $handgrade=$$handgrade{$partID.'_'.$resID};
  	    my $responsetype = $responseType->{$partID}->{$resID};
  	    $hdgrade = $handgrade if ($handgrade eq 'yes');
- Line 254  sub showResourceInfo {
+ Line 217  sub showResourceInfo {
  		$partsseen{$partID}=1;
  	    }
  	    my $display_part=&get_display_part($partID,$symb);
- 	    $result.='<td>'.&mt('<b>Part: </b>[_1]',$display_part).' <span class="LC_internal_info">'.
+ 	    $result.='<td><b>'.&mt('Part').': </b>'.$display_part.
- 		$resID.'</span></td>'.
+                 ' <span class="LC_internal_info">'.$resID.'</span></td>'.
- 		'<td>'.&mt('<b>Type: </b>[_1]',$responsetype).'</td></tr>';
+ 		'<td><b>'.&mt('Type').': </b>'.$responsetype.'</td></tr>';
  #	    '<td>'.&mt('<b>Handgrade: </b>[_1]',$handgrade).'</td></tr>';
  	}
      }
- Line 277  sub reset_caches {
+ Line 240  sub reset_caches {
      }
      sub get_analyze {
- 	my ($symb,$uname,$udom)=@_;
+ 	my ($symb,$uname,$udom,$no_increment)=@_;
  	my $key = "$symb\0$uname\0$udom";
  	return $analyze_cache{$key} if (exists($analyze_cache{$key}));
  	my (undef,undef,$url)=&Apache::lonnet::decode_symb($symb);
  	$url=&Apache::lonnet::clutter($url);
- 	my $subresult=&Apache::lonnet::ssi($url,
+ 	my $subresult=&ssi_with_retries($url, $ssi_retries,
- 					   ('grade_target' => 'analyze'),
+ 					   ('grade_target' => 'analyze',
- 					   ('grade_domain' => $udom),
+ 					    'grade_domain' => $udom,
- 					   ('grade_symb' => $symb),
+ 					    'grade_symb' => $symb,
- 					   ('grade_courseid' =>
+ 					    'grade_courseid' =>
- 					    $env{'request.course.id'}),
+ 					    $env{'request.course.id'},
- 					   ('grade_username' => $uname));
+ 					    'grade_username' => $uname,
+                                             'grade_noincrement' => $no_increment));
  	(undef,$subresult)=split(/_HASH_REF__/,$subresult,2);
  	my %analyze=&Apache::lonnet::str2hash($subresult);
  	return $analyze_cache{$key} = \%analyze;
      }
      sub get_order {
- 	my ($partid,$respid,$symb,$uname,$udom)=@_;
+ 	my ($partid,$respid,$symb,$uname,$udom,$no_increment)=@_;
- 	my $analyze = &get_analyze($symb,$uname,$udom);
+ 	my $analyze = &get_analyze($symb,$uname,$udom,$no_increment);
  	return $analyze->{"$partid.$respid.shown"};
      }
- Line 819  sub listStudents {
+ Line 783  sub listStudents {
      $env{'form.probTitle'} = $env{'form.probTitle'} eq '' ?
  	&Apache::lonnet::gettitle($symb) : $env{'form.probTitle'};
-     my $result='<h3><span class="LC_info">&nbsp;'.
+     my $result='<h3><span class="LC_info">&nbsp;'
- 	&mt($viewgrade.' Submissions for a Student or a Group of Students')
+ 	.&mt("$viewgrade Submissions for a Student or a Group of Students")
  	.'</span></h3>';
      my ($table,undef,$hdgrade,$partlist,$handgrade) = &showResourceInfo($symb,$env{'form.probTitle'},($env{'form.showgrading'} eq 'yes'));
      my %lt = ( 'multiple' =>
- 	       "Please select a student or group of students before clicking on the Next button.",
+ 	       &mt("Please select a student or group of students before clicking on the Next button."),
  	       'single'   =>
- 	       "Please select the student before clicking on the Next button.",
+ 	       &mt("Please select the student before clicking on the Next button."),
  	       );
      %lt = &Apache::lonlocal::texthash(%lt);
      $request->print(<<LISTJAVASCRIPT);
- Line 873  LISTJAVASCRIPT
+ Line 837  LISTJAVASCRIPT
  	"\n".$table;
      $gradeTable .=
- 	'&nbsp;'.
+ 	'&nbsp;<b>'.&mt('View Problem Text').': </b>'.
- 	&mt('<b>View Problem Text: </b>[_1]',
  	    '<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
  	    '<label><input type="radio" name="vProb" value="yes" /> '.&mt('one student').' </label>'."\n".
- 	    '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label>').'<br />'."\n";
+ 	    '<label><input type="radio" name="vProb" value="all" /> '.&mt('all students').' </label><br />'."\n";
      $gradeTable .=
- 	'&nbsp;'.
+ 	'&nbsp;<b>'.&mt('View Answer').': </b>'.
- 	&mt('<b>View Answer: </b>[_1]',
  	    '<label><input type="radio" name="vAns" value="no"  /> '.&mt('no').' </label>'."\n".
  	    '<label><input type="radio" name="vAns" value="yes" /> '.&mt('one student').' </label>'."\n".
- 	    '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label>').'<br />'."\n";
+ 	    '<label><input type="radio" name="vAns" value="all" checked="checked" /> '.&mt('all students').' </label><br />'."\n";
      my $submission_options;
      if ($env{'form.handgrade'} eq 'yes' && scalar(@$partlist) > 1) {
- Line 899  LISTJAVASCRIPT
+ Line 861  LISTJAVASCRIPT
  	'<label><input type="radio" name="lastSub" value="datesub" /> '.&mt('by dates and submissions').' </label>'."\n".
  	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').'</label>';
      $gradeTable .=
- 	'&nbsp;'.
+ 	'&nbsp;<b>'.&mt('Submissions').': </b>'.$submission_options.'<br />'."\n";
- 	&mt('<b>Submissions: </b>[_1]',$submission_options).'<br />'."\n";
      $gradeTable .=
-         '&nbsp;'.
+         '&nbsp;<b>'.&mt('Grading Increments').': </b>'.
- 	&mt('<b>Grading Increments:</b> [_1]',
  	    '<select name="increment">'.
  	    '<option value="1">'.&mt('Whole Points').'</option>'.
  	    '<option value=".5">'.&mt('Half Points').'</option>'.
  	    '<option value=".25">'.&mt('Quarter Points').'</option>'.
  	    '<option value=".1">'.&mt('Tenths of a Point').'</option>'.
- 	    '</select>');
+ 	    '</select>';
      $gradeTable .=
          &build_section_inputs().
- Line 929  LISTJAVASCRIPT
+ Line 889  LISTJAVASCRIPT
  			 &Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,1,'javascript:reLoadList(this.form);')).'<br />';
      }
-     $gradeTable.=&mt('To '.lc($viewgrade).' a submission or a group of submissions, click on the check box(es) '.
+     $gradeTable.=&mt('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".
- 	'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="'.&mt('Next-&gt;').'" /> <br />'."\n";
+ 	'value="'.&mt('Next').' &rarr;" /> <br />'."\n";
      $gradeTable.=&check_buttons();
      $gradeTable.='<label><input type="checkbox" name="checkPlag" checked="checked" />'.&mt('Check For Plagiarism').'</label>';
      my ($classlist, undef, $fullname) = &getclasslist($getsec,'1',$getgroup);
- Line 1029  LISTJAVASCRIPT
+ Line 988  LISTJAVASCRIPT
  	       '&nbsp;'.$section.($group ne '' ?'/'.$group:'').'</td>'."\n";
  	    if ($env{'form.showgrading'} eq 'yes' && $submitonly ne 'all') {
- 		foreach (sort keys(%status)) {
+ 		foreach (sort(keys(%status))) {
  		    next if ($_ =~ /^resource.*?submitted_by$/);
  		    $gradeTable.='<td align="center">&nbsp;'.&mt($status{$_}).'&nbsp;</td>'."\n";
  		}
- Line 1057  LISTJAVASCRIPT
+ Line 1016  LISTJAVASCRIPT
      $gradeTable.=&Apache::loncommon::end_data_table()."\n".
  	'<input type="button" '.
  	'onClick="javascript:checkSelect(this.form.stuinfo);" '.
- 	'value="'.&mt('Next-&gt;').'" /></form>'."\n";
+ 	'value="'.&mt('Next').' &rarr;" /></form>'."\n";
      if ($ctr == 0) {
  	my $num_students=(scalar(keys(%$fullname)));
  	if ($num_students eq 0) {
- Line 1153  sub processGroup {
+ Line 1112  sub processGroup {
  #--- Javascript to handle the submission page functionality ---
  sub sub_page_js {
      my $request = shift;
+ 	    my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
      $request->print(<<SUBJAVASCRIPT);
  <script type="text/javascript" language="javascript">
      function updateRadio(formname,id,weight) {
- Line 1163  sub sub_page_js {
+ Line 1123  sub sub_page_js {
  	gradeBox.value = pts;
  	var resetbox = false;
  	if (isNaN(pts) || pts < 0) {
- 	    alert("A number equal or greater than 0 is expected. Entered value = "+pts);
+ 	    alert("$alertmsg"+pts);
  	    for (var i=0; i<radioButton.length; i++) {
  		if (radioButton[i].checked) {
  		    gradeBox.value = i;
- Line 1408  INNERJS
+ Line 1368  INNERJS
      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
      $docopen=~s/^document\.//;
+     my $alertmsg = &mt('Please select a word or group of words from document and then click this link.');
      $request->print(<<SUBJAVASCRIPT);
  <script type="text/javascript" language="javascript">
- Line 1440  INNERJS
+ Line 1401  INNERJS
      else return;
      var cleantxt = txt.replace(new RegExp('([\\f\\n\\r\\t\\v ])+', 'g')," ");
      if (cleantxt=="") {
- 	alert("Please select a word or group of words from document and then click this link.");
+ 	alert("$alertmsg");
  	return;
      }
      var nret = prompt("Add selection to keyword list? Edit if desired.",cleantxt);
- Line 1679  sub gradeBox {
+ Line 1640  sub gradeBox {
      my $radio.='<table border="0"><tr>'."\n";  # display radio buttons in a nice table 10 across
      while ($thisweight<=$wgt) {
- 	$radio.= '<td><span style="white-space: nowrap;"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
+ 	$radio.= '<td><span class="LC_nobreak"><label><input type="radio" name="RADVAL'.$counter.'_'.$partid.'" '.
  	    'onclick="javascript:writeBox(this.form,\''.$counter.'_'.$partid.'\','.
  	    $thisweight.')" value="'.$thisweight.'" '.
  	    ($score eq $thisweight ? 'checked="checked"':'').' /> '.$thisweight."</label></span></td>\n";
- Line 1695  sub gradeBox {
+ Line 1656  sub gradeBox {
  	$wgt.')" /></td>'."\n";
      $line.='<td>/'.$wgt.' '.$wgtmsg.
  	($$record{'resource.'.$partid.'.solved'} eq 'correct_by_student' ? '&nbsp;'.$checkIcon : '').
- 	' </td><td>'."\n";
+ 	' </td><td><b>'.&mt('Grade Status').':</b>'."\n";
      $line.='<select name="GD_SEL'.$counter.'_'.$partid.'" '.
  	'onChange="javascript:clearRadBox(this.form,\''.$counter.'_'.$partid.'\')" >'."\n";
      if ($$record{'resource.'.$partid.'.solved'} eq 'excused') {
- Line 1708  sub gradeBox {
+ Line 1669  sub gradeBox {
      $line.='<option value="reset status">'.&mt('reset status').'</option></select>'."\n";
+ 	#&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
      $result .=
- 	&mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line);
+ 	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
      $result.='</tr></table>'."\n";
      $result.='<input type="hidden" name="stores'.$counter.'_'.$partid.'" value="" />'."\n".
- Line 1841  sub download_all_link {
+ Line 1802  sub download_all_link {
  	join("\n",&Apache::loncommon::get_env_multiple('form.vPart'));
      my $identifier = &Apache::loncommon::get_cgi_id();
-     &Apache::lonnet::appenv('cgi.'.$identifier.'.students' => $all_students,
+     &Apache::lonnet::appenv({'cgi.'.$identifier.'.students' => $all_students,
-                             'cgi.'.$identifier.'.symb' => $symb,
+                              'cgi.'.$identifier.'.symb' => $symb,
-                             'cgi.'.$identifier.'.parts' => $parts,);
+                              'cgi.'.$identifier.'.parts' => $parts,});
      $r->print('<a href="/cgi-bin/multidownload.pl?'.$identifier.'">'.
  	      &mt('Download All Submitted Documents').'</a>');
      return
- Line 2092  KEYWORDS
+ Line 2053  KEYWORDS
  		    $lastsubonly.="\n".'<div class="LC_grade_submission_part"><b>Part:</b> '.
  			$display_part.' <span class="LC_internal_info">( ID '.$respid.
  			' )</span>&nbsp; &nbsp;'.
- 			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br /><br /></div>';
+ 			'<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br /><br /></div>';
  		    next;
  		}
  		foreach my $submission (@$string) {
- Line 2133  KEYWORDS
+ Line 2094  KEYWORDS
  			    ' )</span>&nbsp; &nbsp;';
  			my $files=&get_submitted_files($udom,$uname,$partid,$respid,\%record);
  			if (@$files) {
- 			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain virusses').'</span><br />';
+ 			    $lastsubonly.='<br /><span class="LC_warning">'.&mt('Like all files provided by users, this file may contain viruses').'</span><br />';
  			    my $file_counter = 0;
  			    foreach my $file (@$files) {
  			        $file_counter++;
- Line 2224  KEYWORDS
+ Line 2185  KEYWORDS
  	$seen{$partid}++;
  	next if ($$handgrade{$part_resp} ne 'yes'
  		 && $env{'form.lastSub'} eq 'hdgrade');
- 	push @partlist,$partid;
+ 	push(@partlist,$partid);
- 	push @gradePartRespid,$partid.'.'.$respid;
+ 	push(@gradePartRespid,$partid.'.'.$respid);
  	$request->print(&gradeBox($request,$symb,$uname,$udom,$counter,$partid,\%record));
      }
      $request->print('</div></div>');
- Line 2356  sub get_last_submission {
+ Line 2317  sub get_last_submission {
  					$$returnhash{$version.':keys'}))) {
  		$lasthash{$key}=$$returnhash{$version.':'.$key};
  		$timestamp =
- 		    scalar(localtime($$returnhash{$version.':timestamp'}));
+ 		    &Apache::lonlocal::locallocaltime($$returnhash{$version.':timestamp'});
  	    }
  	}
  	foreach my $key (keys(%lasthash)) {
- Line 2370  sub get_last_submission {
+ Line 2331  sub get_last_submission {
      }
      if (!@string) {
  	$string[0] =
- 	    '<span class="LC_warning">Nothing submitted - no attempts.</span>';
+ 	    '<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span>';
      }
      return (\@string,\$timestamp);
  }
- Line 2552  sub processHandGrade {
+ Line 2513  sub processHandGrade {
      my (@parsedlist,@nextlist);
      my ($nextflg) = 0;
-     foreach (sort
+     foreach my $item (sort
  	     {
  		 if (lc($$fullname{$a}) ne lc($$fullname{$b})) {
  		     return (lc($$fullname{$a}) cmp lc($$fullname{$b}));
- Line 2560  sub processHandGrade {
+ Line 2521  sub processHandGrade {
  		 return $a cmp $b;
  	     } (keys(%$fullname))) {
  	if ($nextflg == 1 && $button =~ /Next$/) {
- 	    push @parsedlist,$_;
+ 	    push(@parsedlist,$item);
  	}
- 	$nextflg = 1 if ($_ eq $laststu);
+ 	$nextflg = 1 if ($item eq $laststu);
  	if ($button eq 'Previous') {
- 	    last if ($_ eq $firststu);
+ 	    last if ($item eq $firststu);
- 	    push @parsedlist,$_;
+ 	    push(@parsedlist,$item);
  	}
      }
      $ctr = 0;
- Line 2588  sub processHandGrade {
+ Line 2549  sub processHandGrade {
  	    my $submitted = 0;
  	    my $ungraded = 0;
  	    my $incorrect = 0;
- 	    foreach (keys(%status)) {
+ 	    foreach my $item (keys(%status)) {
- 		$submitted = 1 if ($status{$_} ne 'nothing');
+ 		$submitted = 1 if ($status{$item} ne 'nothing');
- 		$ungraded = 1 if ($status{$_} =~ /^ungraded/);
+ 		$ungraded = 1 if ($status{$item} =~ /^ungraded/);
- 		$incorrect = 1 if ($status{$_} =~ /^incorrect/);
+ 		$incorrect = 1 if ($status{$item} =~ /^incorrect/);
- 		my ($foo,$partid,$foo1) = split(/\./,$_);
+ 		my ($foo,$partid,$foo1) = split(/\./,$item);
  		if ($status{'resource.'.$partid.'.submitted_by'} ne '') {
  		    $submitted = 0;
  		}
- Line 2603  sub processHandGrade {
+ Line 2564  sub processHandGrade {
  	    next if (!$ungraded && ($submitonly eq 'graded'));
  	    next if (!$incorrect && $submitonly eq 'incorrect');
  	}
- 	push @nextlist,$student if ($ctr < $ntstu);
+ 	push(@nextlist,$student) if ($ctr < $ntstu);
  	last if ($ctr == $ntstu);
  	$ctr++;
      }
- Line 2611  sub processHandGrade {
+ Line 2572  sub processHandGrade {
      $ctr = 0;
      my $total = scalar(@nextlist)-1;
-     foreach (sort @nextlist) {
+     foreach (sort(@nextlist)) {
  	my ($uname,$udom,$submitter) = split(/:/);
  	$env{'form.student'}  = $uname;
  	$env{'form.userdom'}  = $udom;
- Line 2657  sub saveHandGrade {
+ Line 2618  sub saveHandGrade {
  	    }
  	} elsif ($dropMenu eq 'reset status'
  		 && exists($record{'resource.'.$new_part.'.solved'})) { #don't bother if no old records -> no attempts
- 	    foreach my $key (keys (%record)) {
+ 	    foreach my $key (keys(%record)) {
  		if ($key=~/^resource\.\Q$new_part\E\./) { $newrecord{$key} = ''; }
  	    }
  	    $newrecord{'resource.'.$new_part.'.regrader'}=
- Line 2692  sub saveHandGrade {
+ Line 2653  sub saveHandGrade {
                  &handback_files($request,$symb,$stuname,$domain,$newflg,$new_part,\%newrecord);
  		next;
  	    } else {
- 	        push @parts_graded, $new_part;
+ 	        push(@parts_graded,$new_part);
  	    }
  	    if ($record{'resource.'.$new_part.'.awarded'} ne $partial) {
  		$newrecord{'resource.'.$new_part.'.awarded'}  = $partial;
- Line 2719  sub saveHandGrade {
+ Line 2680  sub saveHandGrade {
  	        $record{'resource.'.$new_part.'.solved'} eq 'incorrect_by_override' ||
  	        $dropMenu eq 'reset status')
  	   {
- 	    push (@version_parts,$new_part);
+ 	    push(@version_parts,$new_part);
  	}
      }
      my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- Line 2767  sub check_and_remove_from_queue {
+ Line 2728  sub check_and_remove_from_queue {
  sub handback_files {
      my ($request,$symb,$stuname,$domain,$newflg,$new_part,$newrecord) = @_;
-     my $portfolio_root = &propath($domain,$stuname).'/userfiles/portfolio';
+     my $portfolio_root = '/userfiles/portfolio';
      my ($partlist,$handgrade,$responseType) = &response_type($symb);
      my @part_response_id = &flatten_responseType($responseType);
- Line 2785  sub handback_files {
+ Line 2746  sub handback_files {
                      my ($answer_name,$answer_ver,$answer_ext) =
  		        &file_name_version_ext($answer_file);
  		    my ($portfolio_path) = ($directory =~ /^.+$stuname\/portfolio(.*)/);
- 		    my @dir_list = &Apache::lonnet::dirlist($portfolio_path,$domain,$stuname,$portfolio_root);
+                     my $getpropath = 1;
+ 		    my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$portfolio_path,$domain,$stuname,$getpropath);
  		    my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                      # fix file name
                      my ($save_file_name) = (($directory.$answer_name.".$version.".$answer_ext) =~ /^.+\/${stuname}\/(.*)/);
- Line 2793  sub handback_files {
+ Line 2755  sub handback_files {
              	                                $newflg.'_'.$part_resp.'_returndoc'.$file_counter,
              	                                $save_file_name);
                      if ($result !~ m|^/uploaded/|) {
-                         $request->print('<span class="LC_error">An error occurred ('.$result.
+                         $request->print('<br /><span class="LC_error">'.
-                         ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
+                             &mt('An error occurred ([_1]) while trying to upload [_2].',
+                                 $result,$newflg.'_'.$part_resp.'_returndoc'.$file_counter).
+                                         '</span>');
                      } else {
                          # mark the file as read only
                          my @files = ($save_file_name);
- Line 2891  sub decrement_aggs {
+ Line 2855  sub decrement_aggs {
      if ($aggtries == $totaltries) {
          $decrement{'users'} = 1;
      }
-     foreach my $type (keys (%decrement)) {
+     foreach my $type (keys(%decrement)) {
          $$aggregate{$symb."\0".$part."\0".$type} = -$decrement{$type};
      }
      return;
- Line 2921  sub version_portfiles {
+ Line 2885  sub version_portfiles {
      my $version_parts = join('|',@$v_flag);
      my @returned_keys;
      my $parts = join('|', @$parts_graded);
-     my $portfolio_root = &propath($domain,$stu_name).
+     my $portfolio_root = '/userfiles/portfolio';
- 	'/userfiles/portfolio';
      foreach my $key (keys(%$record)) {
          my $new_portfiles;
          if ($key =~ /^resource\.($version_parts)\./ && $key =~ /\.portfiles$/ ) {
- Line 2933  sub version_portfiles {
+ Line 2896  sub version_portfiles {
                  my ($directory,$answer_file) =($file =~ /^(.*?)([^\/]*)$/);
  		my ($answer_name,$answer_ver,$answer_ext) =
  		    &file_name_version_ext($answer_file);
-                 my @dir_list = &Apache::lonnet::dirlist($directory,$domain,$stu_name,$portfolio_root);
+                 my $getpropath = 1;
+                 my @dir_list = &Apache::lonnet::dirlist($portfolio_root.$directory,$domain,$stu_name,$getpropath);
                  my $version = &get_next_version($answer_name, $answer_ext, \@dir_list);
                  my $new_answer = &version_selected_portfile($domain, $stu_name, $directory, $answer_file, $version);
                  if ($new_answer ne 'problem getting file') {
- Line 3013  sub file_name_version_ext {
+ Line 2977  sub file_name_version_ext {
  sub viewgrades_js {
      my ($request) = shift;
+     my $alertmsg = &mt('A number equal or greater than 0 is expected. Entered value = ');
      $request->print(<<VIEWJAVASCRIPT);
  <script type="text/javascript" language="javascript">
     function writePoint(partid,weight,point) {
- Line 3021  sub viewgrades_js {
+ Line 2986  sub viewgrades_js {
  	if (point == "textval") {
  	    point = document.classgrade["TEXTVAL_"+partid].value;
  	    if (isNaN(point) || parseFloat(point) < 0) {
- 		alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
+ 		alert("$alertmsg"+parseFloat(point));
  		var resetbox = false;
  		for (var i=0; i<radioButton.length; i++) {
  		    if (radioButton[i].checked) {
- Line 3119  sub viewgrades_js {
+ Line 3084  sub viewgrades_js {
  	var weight = document.classgrade["weight_"+partid].value;
  	if (isNaN(point) || parseFloat(point) < 0) {
- 	    alert("A number equal or greater than 0 is expected. Entered value = "+parseFloat(point));
+ 	    alert("$alertmsg"+parseFloat(point));
  	    textbox.value = "";
  	    return;
  	}
- Line 3211  sub viewgrades {
+ Line 3176  sub viewgrades {
      my $sectionClass;
      my $section_display = join (", ",&Apache::loncommon::get_env_multiple('form.section'));
      if ($env{'form.section'} eq 'all') {
- 	$sectionClass='Class';
+ 	$sectionClass=&mt('Class');
      } elsif ($env{'form.section'} eq 'none') {
- 	$sectionClass='Students in no Section';
+ 	$sectionClass=&mt('Students in no Section');
      } else {
- 	$sectionClass='Students in Section(s) [_1]';
+ 	$sectionClass=&mt('Students in Section(s) [_1]');
      }
      $result.=
  	'<h3>'.
- 	&mt("Assign Common Grade To $sectionClass",$section_display).'</h3>';
+ 	&mt("Assign Common Grade to [_1]",$sectionClass,$section_display).'</h3>';
      $result.= &Apache::loncommon::start_data_table();
      #radio buttons/text box for assigning points for a section or class.
      #handles different parts of a problem
- Line 3251  sub viewgrades {
+ Line 3216  sub viewgrades {
  	my $line = '<input type="text" name="TEXTVAL_'.
  	    $partid.'" size="4" '.'onChange="javascript:writePoint(\''.
  		$partid.'\','.$weight{$partid}.',\'textval\')" /> /'.
- 	    $weight{$partid}.' (problem weight)</td>'."\n";
+ 	    $weight{$partid}.' '.&mt('(problem weight)').'</td>'."\n";
- 	$line.= '<td><select name="SELVAL_'.$partid.'"'.
+ 	$line.= '<td><b>'.&mt('Grade Status').':</b><select name="SELVAL_'.$partid.'"'.
  	    'onChange="javascript:writeRadText(\''.$partid.'\','.
  		$weight{$partid}.')"> '.
  	    '<option selected="selected"> </option>'.
- Line 3267  sub viewgrades {
+ Line 3232  sub viewgrades {
  	$result.=
  	    &Apache::loncommon::start_data_table_row()."\n".
- 	    &mt('<td><b>Part:</b></td><td>[_1]</td><td><b>Points:</b></td><td>[_2]</td><td>or</td><td>[_3]</td>',$display_part,$radio,$line).
+ 	    '<td><b>'.&mt('Part').':</b></td><td>'.$display_part.'</td><td><b>'.&mt('Points').':</b></td><td>'.$radio.'</td><td>'.&mt('or').'</td><td>'.$line.'</td>'.
  	    &Apache::loncommon::end_data_table_row()."\n";
  	$ctsparts++;
      }
- Line 3278  sub viewgrades {
+ Line 3243  sub viewgrades {
      #table listing all the students in a section/class
      #header of table
-     $result.= '<h3>'.&mt('Assign Grade to Specific Students in '.$sectionClass,
+     $result.= '<h3>'.&mt('Assign Grade to Specific Students in ').$sectionClass,
- 			 $section_display).'</h3>';
+ 			 $section_display.'</h3>';
      $result.= &Apache::loncommon::start_data_table().
  	&Apache::loncommon::start_data_table_header_row().
  	'<th>'.&mt('No.').'</th>'.
- Line 3289  sub viewgrades {
+ Line 3254  sub viewgrades {
      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
+         my $narrowtext = &mt('Tries');
+ 	$display =~ s|^Number of Attempts|$narrowtext <br />|; # makes the column narrower
  	if  (!$display) { $display = &Apache::lonnet::metadata($url,$part.'.name'); }
  	my ($partid) = &split_part_type($part);
-         push(@partids, $partid);
+         push(@partids,$partid);
  	my $display_part=&get_display_part($partid,$symb);
  	if ($display =~ /^Partial Credit Factor/) {
  	    $result.='<th>'.
- Line 3446  sub editgrades {
+ Line 3412  sub editgrades {
      my $header;
      while ($ctr < $env{'form.totalparts'}) {
  	my $partid = $env{'form.partid_'.$ctr};
- 	push @partid,$partid;
+ 	push(@partid,$partid);
  	$weight{$partid} = $env{'form.weight_'.$partid};
  	$ctr++;
      }
- Line 3461  sub editgrades {
+ Line 3427  sub editgrades {
  	    if ($type eq 'awarded' || $type eq 'solved') { next; }
  	    my $display=&Apache::lonnet::metadata($url,$stores.'.display');
  	    $display =~ s/\[Part: (\w)+\]//;
- 	    $display =~ s/Number of Attempts/Tries/;
+             my $narrowtext = &mt('Tries');
- 	    $header .= '<th align="center">'.&mt('Old '.$display).'</th>'.
+ 	    $display =~ s/Number of Attempts/$narrowtext/;
- 		'<th align="center">'.&mt('New '.$display).'</th>';
+ 	    $header .= '<th align="center">'.&mt('Old').' '.$display.'</th>'.
+ 		'<th align="center">'.&mt('New').' '.$display.'</th>';
  	    $columns{$partid}+=2;
  	}
      }
- Line 3805  ENDPICK
+ Line 3772  ENDPICK
  }
  sub checkforfile_js {
+     my $alertmsg = &mt('Please use the browse button to select a file from your local directory.');
      my $result =<<CSVFORMJS;
  <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.");
+ 	    alert("$alertmsg");
  	    return false;
  	}
  	formname.submit();
- Line 3829  sub upcsvScores_form {
+ Line 3797  sub upcsvScores_form {
      $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";
-     $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource').
+     $result.='&nbsp;<b>'.&mt('Specify a file containing the class scores for current resource.').
- 	'.</b></td></tr>'."\n";
+ 	'</b></td></tr>'."\n";
      $result.='<tr bgcolor=#ffffe6><td>'."\n";
      my $upload=&mt("Upload Scores");
      my $upfile_select=&Apache::loncommon::upfile_select_html();
- Line 4042  sub csvuploadassign {
+ Line 4010  sub csvuploadassign {
  		$grades{$store_key}=$entries{$fields{$dest}};
  	    }
  	}
- 	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
+ 	if (! %grades) {
- 	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+            push(@skipped,&mt("[_1]: no data to save","$username:$domain"));
- 	my $result=&Apache::lonnet::cstore(\%grades,$symb,
+         } else {
+ 	   $grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
+ 	   my $result=&Apache::lonnet::cstore(\%grades,$symb,
  					   $env{'request.course.id'},
  					   $domain,$username);
- 	if ($result eq 'ok') {
+ 	   if ($result eq 'ok') {
- 	    $request->print('.');
+ 	      $request->print('.');
- 	} else {
+ 	   } else {
- 	    $request->print("<p>
+ 	      $request->print("<p><span class=\"LC_error\">".
-                               <span class=\"LC_error\">
+                               &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
-                                  Failed to save student $username:$domain.
+                                   "$username:$domain",$result)."</span></p>");
-                                  Message when trying to save was ($result)
+ 	   }
-                               </span>
+ 	   $request->rflush();
-                              </p>" );
+ 	   $countdone++;
- 	}
+         }
- 	$request->rflush();
- 	$countdone++;
      }
-     $request->print("<br />Saved $countdone students\n");
+     $request->print('<br /><span class="LC_info">'.&mt("Saved [_1] students",$countdone)."</span>\n");
      if (@skipped) {
- 	$request->print('<p><h4><b>Skipped Students</b></h4></p>');
+ 	$request->print('<p><span class="LC_warning">'.&mt('Skipped Students').'</span></p>');
  	foreach my $student (@skipped) { $request->print("$student<br />\n"); }
      }
      if (@notallowed) {
- 	$request->print('<p><span class="LC_error">Students Not Allowed to Modify</span></p>');
+ 	$request->print('<p><span class="LC_error">'.&mt('Students Not Allowed to Modify').'</span></p>');
  	foreach my $student (@notallowed) { $request->print("$student<br />\n"); }
      }
      $request->print("<br />\n");
- Line 4083  sub csvuploadassign {
+ Line 4051  sub csvuploadassign {
  sub pickStudentPage {
      my ($request) = shift;
+     my $alertmsg = &mt('Please select the student you wish to grade.');
      $request->print(<<LISTJAVASCRIPT);
  <script type="text/javascript" language="javascript">
  function checkPickOne(formname) {
      if (radioSelection(formname.student) == null) {
- 	alert("Please select the student you wish to grade.");
+ 	alert("$alertmsg");
  	return;
      }
      ptr = pullDownSelection(formname.selectpage);
- Line 4123  LISTJAVASCRIPT
+ Line 4092  LISTJAVASCRIPT
  	$ctr++;
      }
      $select.= '</select>';
-     $result.=&mt('&nbsp;<b>Problems from:</b> [_1]',$select)."<br />\n";
+     $result.='&nbsp;<b>'.&mt('Problems from').':</b> '.$select."<br />\n";
      $ctr=0;
      foreach (@$titles) {
- Line 4138  LISTJAVASCRIPT
+ Line 4107  LISTJAVASCRIPT
      my $options =
  	'<label><input type="radio" name="vProb" value="no" checked="checked" /> '.&mt('no').' </label>'."\n".
  	'<label><input type="radio" name="vProb" value="yes" /> '.&mt('yes').' </label>'."<br />\n";
-     $result.='&nbsp;'.&mt('<b>View Problems Text: </b> [_1]',$options);
+     $result.='&nbsp;<b>'.&mt('View Problem Text').': </b>'.$options;
      $options =
  	'<label><input type="radio" name="lastSub" value="none" /> '.&mt('none').' </label>'."\n".
  	'<label><input type="radio" name="lastSub" value="datesub" checked="checked" /> '.&mt('by dates and submissions').'</label>'."\n".
  	'<label><input type="radio" name="lastSub" value="all" /> '.&mt('all details').' </label>'."\n";
-     $result.='&nbsp;'.&mt('<b>Submission Details: </b>[_1]',$options);
+     $result.='&nbsp;<b>'.&mt('Submissions').': </b>'.$options;
      $result.=&build_section_inputs();
      my $stu_status = join(':',&Apache::loncommon::get_env_multiple('form.Status'));
- Line 4153  LISTJAVASCRIPT
+ Line 4122  LISTJAVASCRIPT
  	'<input type="hidden" name="symb"    value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  	'<input type="hidden" name="saveState" value="'.$env{'form.saveState'}.'" />'."<br />\n";
-     $result.='&nbsp;'.&mt('<b>Use CODE: [_1] </b>',
+     $result.='&nbsp;<b>'.&mt('Use CODE').': </b> <input type="text" name="CODE" value="" /> <br />'."\n";
- 			  '<input type="text" name="CODE" value="" />').
- 			      '<br />'."\n";
      $result.='&nbsp;<input type="button" '.
- 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /><br />'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /><br />'."\n";
      $request->print($result);
- Line 4197  LISTJAVASCRIPT
+ Line 4164  LISTJAVASCRIPT
      }
      $studentTable.=&Apache::loncommon::end_data_table()."\n";
      $studentTable.='<input type="button" '.
- 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next-&gt;').'" /></form>'."\n";
+ 	'onClick="javascript:checkPickOne(this.form);" value="'.&mt('Next').' &rarr;" /></form>'."\n";
      $studentTable.=&show_grading_menu_form($symb);
      $request->print($studentTable);
- Line 4256  sub displayPage {
+ Line 4223  sub displayPage {
      my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
      $result.='<h3>&nbsp;'.&mt('Student: [_1]',&nameUserString(undef,$$fullname{$env{'form.student'}},$uname,$udom)).
  	'</h3>'."\n";
-     if (&Apache::lonnet::validCODE($env{'form.CODE'})) {
+     $env{'form.CODE'} = uc($env{'form.CODE'});
+     if (&Apache::lonnet::validCODE(uc($env{'form.CODE'}))) {
  	$result.='<h3>&nbsp;'.&mt('CODE: [_1]',$env{'form.CODE'}).'</h3>'."\n";
      } else {
  	delete($env{'form.CODE'});
- Line 4333  sub displayPage {
+ Line 4301  sub displayPage {
  #		    $request->print('match='.$1."<br />\n");
  #		}
  #		$companswer =~ s|<table border=\"1\">|<table border=\"0\">|g;
- 		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;'.&mt('<b>Correct answer:</b><br />[_1]',$companswer);
+ 		$studentTable.='&nbsp;<b>'.$title.'</b>&nbsp;<br />&nbsp;<b>'.&mt('Correct answer').':</b><br />'.$companswer;
  	    }
  	    my %record = &Apache::lonnet::restore($symbx,$env{'request.course.id'},$udom,$uname);
- Line 4403  sub displaySubByDates {
+ Line 4371  sub displaySubByDates {
      my %orders;
      $mark{'correct_by_student'} = $checkIcon;
      if (!exists($$record{'1:timestamp'})) {
- 	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts').'</span><br />';
+ 	return '<br />&nbsp;<span class="LC_warning">'.&mt('Nothing submitted - no attempts.').'</span><br />';
      }
      my $interaction;
+     my $no_increment = 1;
      for ($version=1;$version<=$$record{'version'};$version++) {
  	my $timestamp =
  	    &Apache::lonlocal::locallocaltime($$record{$version.':timestamp'});
- Line 4450  sub displaySubByDates {
+ Line 4419  sub displaySubByDates {
  		    if (!exists($orders{$partid})) { $orders{$partid}={}; }
  		    if (!exists($orders{$partid}->{$responseId})) {
  			$orders{$partid}->{$responseId}=
- 			    &get_order($partid,$responseId,$symb,$uname,$udom);
+ 			    &get_order($partid,$responseId,$symb,$uname,$udom,
+                                        $no_increment);
  		    }
  		    $displaySub[0].='</b>&nbsp; '.
  			&cleanRecord($$record{$version.':'.$matchKey},$responseType,$symb,$partid,$responseId,$record,$orders{$partid}->{$responseId},"$version:",$uname,$udom).'<br />';
- Line 4503  sub updateGradeByPage {
+ Line 4473  sub updateGradeByPage {
      my ($uname,$udom) = split(/:/,$env{'form.student'});
      my $usec=$classlist->{$env{'form.student'}}[5];
      if (!&canmodify($usec)) {
- 	$request->print('<span class="LC_warning">Unable to modify requested student.('.$env{'form.student'}.'</span>');
+ 	$request->print('<span class="LC_warning">'.&mt('Unable to modify requested student ([_1])',$env{'form.student'}).'</span>');
  	$request->print(&show_grading_menu_form($env{'form.symb'}));
  	return;
      }
      my $result='<h3><span class="LC_info">&nbsp;'.$env{'form.title'}.'</span></h3>';
-     $result.='<h3>&nbsp;Student: '.&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
+     $result.='<h3>&nbsp;'.&mt('Student: ').&nameUserString(undef,$env{'form.fullname'},$uname,$udom).
  	'</h3>'."\n";
      $request->print($result);
- Line 4517  sub updateGradeByPage {
+ Line 4487  sub updateGradeByPage {
      my ($mapUrl, $id, $resUrl) = &Apache::lonnet::decode_symb( $env{'form.page'});
      my $map = $navmap->getResourceByUrl($resUrl); # add to navmaps
      if (!$map) {
- 	$request->print('<span class="LC_warning">Unable to grade requested sequence. ('.$resUrl.')</span>');
+ 	$request->print('<span class="LC_warning">'.&mt('Unable to grade requested sequence ([_1]).',$resUrl).'</span>');
  	my ($symb)=&get_symb($request);
  	$request->print(&show_grading_menu_form($symb));
  	return;
- Line 4549  sub updateGradeByPage {
+ Line 4519  sub updateGradeByPage {
  		&Apache::loncommon::start_data_table_row().
  		'<td align="center" valign="top" >'.$prob.
  		(scalar(@{$parts}) == 1 ? ''
-                                         : '<br />('.&mt('[quant,_1,&nbsp;parts]',scalar(@{$parts}))
+                                         : '<br />('.&mt('[quant,_1,&nbsp;part]',scalar(@{$parts}))
- 		 ).')</td>';
+ 		.')').'</td>';
  	    $studentTable.='<td valign="top">&nbsp;<b>'.$title.'</b>&nbsp;</td>';
  	    my %newrecord=();
- Line 4594  sub updateGradeByPage {
+ Line 4564  sub updateGradeByPage {
  		}
  		my $display_part=&get_display_part($partid,$curRes->symb());
  		my $oldstatus = $env{'form.solved'.$question.'_'.$partid};
- 		$displayPts[0].='&nbsp;<b>Part:</b> '.$display_part.' = '.
+ 		$displayPts[0].='&nbsp;<b>'.&mt('Part').':</b> '.$display_part.' = '.
  		    (($oldstatus eq 'excused') ? 'excused' : $oldpts).
  		    '&nbsp;<br />';
- 		$displayPts[1].='&nbsp;<b>Part:</b> '.$display_part.' = '.
+ 		$displayPts[1].='&nbsp;<b>'.&mt('Part').':</b> '.$display_part.' = '.
  		     (($score eq 'excused') ? 'excused' : $newpts).
  		    '&nbsp;<br />';
  		$question++;
- Line 4646  sub updateGradeByPage {
+ Line 4616  sub updateGradeByPage {
      $studentTable.=&Apache::loncommon::end_data_table();
      $studentTable.=&show_grading_menu_form($env{'form.symb'});
-     my $grademsg=($changeflag == 0 ? 'No score was changed or updated.' :
+     my $grademsg=($changeflag == 0 ? &mt('No score was changed or updated.') :
- 		  'The scores were changed for '.
+ 		  &mt('The scores were changed for [quant,_1,problem].',
- 		  $changeflag.' problem'.($changeflag == 1 ? '.' : 's.'));
+ 		  $changeflag));
      $request->print($grademsg.$studentTable);
      return '';
- Line 4757  sub getSequenceDropDown {
+ Line 4727  sub getSequenceDropDown {
      return $result;
  }
+ my %bubble_lines_per_response;     # no. bubble lines for each response.
+                                    # index is "symb.part_id"
+ my %first_bubble_line;             # First bubble line no. for each bubble.
+ my %subdivided_bubble_lines;       # no. bubble lines for optionresponse,
+                                    # matchresponse or rankresponse, where
+                                    # an individual response can have multiple
+                                    # lines
+ my %responsetype_per_response;     # responsetype for each response
+ # Save and restore the bubble lines array to the form env.
+ sub save_bubble_lines {
+     foreach my $line (keys(%bubble_lines_per_response)) {
+ 	$env{"form.scantron.bubblelines.$line"}  = $bubble_lines_per_response{$line};
+ 	$env{"form.scantron.first_bubble_line.$line"} =
+ 	    $first_bubble_line{$line};
+         $env{"form.scantron.sub_bubblelines.$line"} =
+             $subdivided_bubble_lines{$line};
+         $env{"form.scantron.responsetype.$line"} =
+             $responsetype_per_response{$line};
+     }
+ }
+ sub restore_bubble_lines {
+     my $line = 0;
+     %bubble_lines_per_response = ();
+     while ($env{"form.scantron.bubblelines.$line"}) {
+ 	my $value = $env{"form.scantron.bubblelines.$line"};
+ 	$bubble_lines_per_response{$line} = $value;
+ 	$first_bubble_line{$line}  =
+ 	    $env{"form.scantron.first_bubble_line.$line"};
+         $subdivided_bubble_lines{$line} =
+             $env{"form.scantron.sub_bubblelines.$line"};
+         $responsetype_per_response{$line} =
+             $env{"form.scantron.responsetype.$line"};
+ 	$line++;
+     }
+ }
+ #  Given the parsed scanline, get the response for
+ #  'answer' number n:
+ sub get_response_bubbles {
+     my ($parsed_line, $response)  = @_;
+     my $bubble_line = $first_bubble_line{$response-1} +1;
+     my $bubble_lines= $bubble_lines_per_response{$response-1};
+     my $selected = "";
+     for (my $bline = 0; $bline < $bubble_lines; $bline++) {
+ 	$selected .= $$parsed_line{"scantron.$bubble_line.answer"}.":";
+ 	$bubble_line++;
+     }
+     return $selected;
+ }
  =pod
- Line 4769  sub getSequenceDropDown {
+ Line 4802  sub getSequenceDropDown {
  sub scantron_filenames {
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cname=$env{'course.'.$env{'request.course.id'}.'.num'};
+     my $getpropath = 1;
      my @files=&Apache::lonnet::dirlist('userfiles',$cdom,$cname,
- 				    &propath($cdom,$cname));
+                                        $getpropath);
      my @possiblenames;
      foreach my $filename (sort(@files)) {
  	($filename)=split(/&/,$filename);
- Line 4813  sub scantron_uploads {
+ Line 4847  sub scantron_uploads {
  =cut
  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 @lines = &get_scantronformat_file();
- 	my ($name,$descrip)=split(/:/,$line);
+     if (@lines > 0) {
- 	if ($name =~ /^\#/) { next; }
+         foreach my $line (@lines) {
- 	$result.='<option value="'.$name.'">'.$descrip.'</option>'."\n";
+             next if (($line =~ /^\#/) || ($line eq ''));
+ 	    my ($name,$descrip)=split(/:/,$line);
+ 	    $result.='<option value="'.$name.'">'.$descrip.'</option>'."\n";
+         }
      }
      $result.='</select>'."\n";
      return $result;
  }
+ =pod
+ =item get_scantronformat_file
+   Returns an array containing lines from the scantron format file for
+   the domain of the course.
+   If a url for a custom.tab file is listed in domain's configuration.db,
+   lines are from this file.
+   Otherwise, if a default.tab has been published in RES space by the
+   domainconfig user, lines are from this file.
+   Otherwise, fall back to getting lines from the legacy file on the
+   local server:  /home/httpd/lonTabs/default_scantronformat.tab
+ =cut
+ sub get_scantronformat_file {
+     my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
+     my %domconfig = &Apache::lonnet::get_dom('configuration',['scantron'],$cdom);
+     my $gottab = 0;
+     my @lines;
+     if (ref($domconfig{'scantron'}) eq 'HASH') {
+         if ($domconfig{'scantron'}{'scantronformat'} ne '') {
+             my $formatfile = &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'});
+             if ($formatfile ne '-1') {
+                 @lines = split("\n",$formatfile,-1);
+                 $gottab = 1;
+             }
+         }
+     }
+     if (!$gottab) {
+         my $confname = $cdom.'-domainconfig';
+         my $default = $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab';
+         my $formatfile =  &Apache::lonnet::getfile($default);
+         if ($formatfile ne '-1') {
+             @lines = split("\n",$formatfile,-1);
+             $gottab = 1;
+         }
+     }
+     if (!$gottab) {
+         my @domains = &Apache::lonnet::current_machine_domains();
+         if (grep(/^\Q$cdom\E$/,@domains)) {
+             my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+             @lines = <$fh>;
+             close($fh);
+         } else {
+             my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/default_scantronformat.tab');
+             @lines = <$fh>;
+             close($fh);
+         }
+     }
+     return @lines;
+ }
  =pod
  =item scantron_CODElist
- Line 4858  sub scantron_CODElist {
+ Line 4949  sub scantron_CODElist {
  =cut
  sub scantron_CODEunique {
-     my $result='<span style="white-space: nowrap;">
+     my $result='<span class="LC_nobreak">
                   <label><input type="radio" name="scantron_CODEunique"
                          value="yes" checked="checked" />'.&mt('Yes').' </label>
                  </span>
-                 <span style="white-space: nowrap;">
+                 <span class="LC_nobreak">
                   <label><input type="radio" name="scantron_CODEunique"
                          value="no" />'.&mt('No').' </label>
                  </span>';
- Line 4899  sub scantron_selectphase {
+ Line 4990  sub scantron_selectphase {
      my $CODE_unique=&scantron_CODEunique();
      my $result;
+     $ssi_error = 0;
      # Chunk of form to prompt for a file to grade and how:
      $result.= '
- Line 4909  sub scantron_selectphase {
+ Line 5002  sub scantron_selectphase {
      '.&Apache::loncommon::start_data_table('LC_scantron_action').'
         '.&Apache::loncommon::start_data_table_header_row().'
              <th colspan="2">
-               &nbsp;Specify file and which Folder/Sequence to grade
+               &nbsp;'.&mt('Specify file and which Folder/Sequence to grade').'
              </th>
         '.&Apache::loncommon::end_data_table_header_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> Sequence to grade: </td><td> '.$sequence_selector.' </td>
+             <td> '.&mt('Sequence to grade:').' </td><td> '.$sequence_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> Filename of scoring office file: </td><td> '.$file_selector.' </td>
+             <td> '.&mt('Filename of scoring office file:').' </td><td> '.$file_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> Format of data file: </td><td> '.$format_selector.' </td>
+             <td> '.&mt('Format of data file:').' </td><td> '.$format_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> Saved CODEs to validate against: </td><td> '.$CODE_selector.' </td>
+             <td> '.&mt('Saved CODEs to validate against:').' </td><td> '.$CODE_selector.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
-             <td> Each CODE is only to be used once:</td><td> '.$CODE_unique.' </td>
+             <td> '.&mt('Each CODE is only to be used once:').'</td><td> '.$CODE_unique.' </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
- 	    <td> Options: </td>
+ 	    <td> '.&mt('Options:').' </td>
              <td>
- 	       <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_redo" value="redo_skipped"/> '.&mt('Do only previously skipped records').'</label> <br />
-                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> Remove all existing corrections</label> <br />
+                <label><input type="checkbox" name="scantron_options_ignore" value="ignore_corrections"/> '.&mt('Remove all existing corrections').'</label> <br />
-                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> Skip hidden resources when grading</label>
+                <label><input type="checkbox" name="scantron_options_hidden" value="ignore_hidden"/> '.&mt('Skip hidden resources when grading').'</label>
  	    </td>
         '.&Apache::loncommon::end_data_table_row().'
         '.&Apache::loncommon::start_data_table_row().'
              <td colspan="2">
-               <input type="submit" value="Grading: Validate Scantron Records" />
+               <input type="submit" value="'.&mt('Grading: Validate Scantron Records').'" />
              </td>
         '.&Apache::loncommon::end_data_table_row().'
      '.&Apache::loncommon::end_data_table().'
- Line 4956  sub scantron_selectphase {
+ Line 5049  sub scantron_selectphase {
      '.&Apache::loncommon::start_data_table('LC_scantron_action').'
         '.&Apache::loncommon::start_data_table_header_row().'
              <th>
-               &nbsp;Specify a Scantron data file to upload.
+               &nbsp;'.&mt('Specify a Scantron data file to upload.').'
              </th>
         '.&Apache::loncommon::end_data_table_header_row().'
         '.&Apache::loncommon::start_data_table_row().'
- Line 4965  sub scantron_selectphase {
+ Line 5058  sub scantron_selectphase {
      my $default_form_data=&defaultFormData(&get_symb($r,1));
      my $cdom= $env{'course.'.$env{'request.course.id'}.'.domain'};
      my $cnum= $env{'course.'.$env{'request.course.id'}.'.num'};
-     $r->print(<<UPLOAD);
+     $r->print('
                <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.");
+ 	    alert("'.&mt('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'>
+               <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
-                 $default_form_data
+                 '.$default_form_data.'
-                 <input name='courseid' type='hidden' value='$cnum' />
+                 <input name="courseid" type="hidden" value="'.$cnum.'" />
-                 <input name='domainid' type='hidden' value='$cdom' />
+                 <input name="domainid" type="hidden" value="'.$cdom.'" />
-                 <input name='command' value='scantronupload_save' type='hidden' />
+                 <input name="command" value="scantronupload_save" type="hidden" />
-                 File to upload:<input type="file" name="upfile" size="50" />
+                 '.&mt('File to upload: [_1]','<input type="file" name="upfile" size="50" />').'
                  <br />
-                 <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+                 <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
                </form>
- UPLOAD
+ ');
          $r->print('
              </td>
- Line 5005  UPLOAD
+ Line 5098  UPLOAD
       '.&Apache::loncommon::start_data_table('LC_scantron_action').'
         '.&Apache::loncommon::start_data_table_header_row().'
                <th>
-                 &nbsp;Download a scoring office file
+                 &nbsp;'.&mt('Download a scoring office file').'
                </th>
         '.&Apache::loncommon::end_data_table_header_row().'
         '.&Apache::loncommon::start_data_table_row().'
-               <td> Filename of scoring office file: '.$file_selector.'
+               <td> '.&mt('Filename of scoring office file: [_1]',$file_selector).'
                  <br />
-                 <input type="submit" value="Download: Show List of Associated Files" />
+                 <input type="submit" value="'.&mt('Download: Show List of Associated Files').'" />
         '.&Apache::loncommon::end_data_table_row().'
       '.&Apache::loncommon::end_data_table().'
     </form>
- Line 5019  UPLOAD
+ Line 5112  UPLOAD
  ');
      &Apache::lonpickcode::code_list($r,2);
+     $r->print('<br /><form method="post" name="checkscantron">'.
+              $default_form_data."\n".
+              &Apache::loncommon::start_data_table('LC_scantron_action')."\n".
+              &Apache::loncommon::start_data_table_header_row()."\n".
+              '<th colspan="2">
+               &nbsp;'.&mt('Review scantron data and submissions for a previously graded folder/sequence')."\n".
+              '</th>'."\n".
+               &Apache::loncommon::end_data_table_header_row()."\n".
+               &Apache::loncommon::start_data_table_row()."\n".
+               '<td> '.&mt('Graded folder/sequence:').' </td>'."\n".
+               '<td> '.$sequence_selector.' </td>'.
+               &Apache::loncommon::end_data_table_row()."\n".
+               &Apache::loncommon::start_data_table_row()."\n".
+               '<td> '.&mt('Filename of scoring office file:').' </td>'."\n".
+               '<td> '.$file_selector.' </td>'."\n".
+               &Apache::loncommon::end_data_table_row()."\n".
+               &Apache::loncommon::start_data_table_row()."\n".
+               '<td> '.&mt('Format of data file:').' </td>'."\n".
+               '<td> '.$format_selector.' </td>'."\n".
+               &Apache::loncommon::end_data_table_row()."\n".
+               &Apache::loncommon::start_data_table_row()."\n".
+               '<td colspan="2">'."\n".
+               '<input type="hidden" name="command" value="checksubmissions" />'."\n".
+               '<input type="submit" value="'.&mt('Review Scantron Data and Submission Records').'" />'."\n".
+               '</td>'."\n".
+               &Apache::loncommon::end_data_table_row()."\n".
+               &Apache::loncommon::end_data_table()."\n".
+               '</form><br />');
      $r->print($grading_menu_button);
-     return
+     return;
  }
  =pod
- Line 5082  UPLOAD
+ Line 5204  UPLOAD
  sub get_scantron_config {
      my ($which) = @_;
-     my $fh=Apache::File->new($Apache::lonnet::perlvar{'lonTabDir'}.'/scantronformat.tab');
+     my @lines = &get_scantronformat_file();
      my %config;
      #FIXME probably should move to XML it has already gotten a bit much now
-     foreach my $line (<$fh>) {
+     foreach my $line (@lines) {
  	my ($name,$descrip)=split(/:/,$line);
  	if ($name ne $which ) { next; }
  	chomp($line);
- Line 5098  sub get_scantron_config {
+ Line 5220  sub get_scantron_config {
  	$config{'IDstart'}=$config[5];
  	$config{'IDlength'}=$config[6];
  	$config{'Qstart'}=$config[7];
- 	$config{'Qlength'}=$config[8];
+  	$config{'Qlength'}=$config[8];
  	$config{'Qoff'}=$config[9];
  	$config{'Qon'}=$config[10];
  	$config{'PaperID'}=$config[11];
- Line 5172  sub username_to_idmap {
+ Line 5294  sub username_to_idmap {
                            - 'answer'
                                 'response' - new answer or 'none' if blank
                                 'question' - the bubble line to change
+                                'questionnum' - the question identifier,
+                                                may include subquestion.
    Returns:
      $line - the modified scanline
- Line 5184  sub username_to_idmap {
+ Line 5308  sub username_to_idmap {
  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 too large');
- Line 5216  sub scantron_fixup_scanline {
+ Line 5338  sub scantron_fixup_scanline {
  		   $$scantron_config{'CODElength'})=$args->{'CODE'};
  	}
      } elsif ($field eq 'answer') {
- 	&scantron_get_maxbubble(); # Need the bubble counter info.
+ 	my $length=$scantron_config->{'Qlength'};
- 	my $length =$scantron_config->{'Qlength'};
  	my $off=$scantron_config->{'Qoff'};
  	my $on=$scantron_config->{'Qon'};
-         my $question_number = $args->{'question'} -1;
+ 	my $answer=${off}x$length;
-         my $first_position  = $first_bubble_line{$question_number};
+ 	if ($args->{'response'} eq 'none') {
- 	my $bubble_count    = $bubble_lines_per_response{$question_number};
+ 	    &scan_data($scan_data,
-         my $bubbles_per_line= $$scantron_config{'Qlength'};
+ 		       "$whichline.no_bubble.".$args->{'questionnum'},'1');
- 	my $answer=${off}x($bubbles_per_line*$bubble_count);
+ 	} else {
-         my $final_answer;
+ 	    if ($on eq 'letter') {
-         if ($$scantron_config{'Qon'} eq 'letter'  ||
+ 		my @alphabet=('A'..'Z');
- 	    $$scantron_config{'Qon'} eq 'number') {
+ 		$answer=$alphabet[$args->{'response'}];
- 	    $bubbles_per_line = 10;
+ 	    } elsif ($on eq 'number') {
- 	}
+ 		$answer=$args->{'response'}+1;
- 	if (defined $args->{'response'}) {
+ 		if ($answer == 10) { $answer = '0'; }
- 	    if ($args->{'response'} eq 'none') {
- 		&scan_data($scan_data,
- 			   "$whichline.no_bubble.".$args->{'question'},'1');
  	    } else {
- 		my ($bubble_line, $bubble_number) = split(/:/,$args->{'response'});
+ 		substr($answer,$args->{'response'},1)=$on;
- 		if ($on eq 'letter') {
- 		    my @alphabet=('A'..'Z');
- 		    $answer=$alphabet[$bubble_number];
- 		} elsif ($on eq 'number') {
- 		    $answer= $bubble_number+1;
- 		    if ($answer == 10) { $answer = '0'; }
- 		} else {
- 		    substr($answer,$bubble_number+$bubble_line*$bubbles_per_line,1)=$on;
- 		    $final_answer = $answer;
- 		}
- 		&scan_data($scan_data,
- 			   "$whichline.no_bubble.".$args->{'question'},undef,'1');
- 		# Positional notation already has the right final answer length..
- 		if (($on eq 'letter') || ($on eq 'number')) {
- 		    for (my $l = 0; $l < $bubble_count; $l++) {
- 			if ($l eq $bubble_line) {
- 			    $final_answer .= $answer;
- 			} else {
- 			    $final_answer .= ' ';
- 			}
- 		    }
- 		}
  	    }
- 	    # $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ 	    &scan_data($scan_data,
- 	    #substr($line,$where-1,$length)=$answer;
+ 		       "$whichline.no_bubble.".$args->{'questionnum'},undef,'1');
- 	    substr($line,
- 		   $scantron_config->{'Qstart'}+$first_position-1,
- 		   $bubbles_per_line*$length) = $final_answer;
  	}
+ 	my $where=$length*($args->{'question'}-1)+$scantron_config->{'Qstart'};
+ 	substr($line,$where-1,$length)=$answer;
      }
      return $line;
  }
- Line 5301  sub scan_data {
+ Line 5393  sub scan_data {
      return $scan_data->{$filename.'_'.$key};
  }
+ # ----- These first few routines are general use routines.----
+ # Return the number of occurences of a pattern in a string.
+ sub occurence_count {
+     my ($string, $pattern) = @_;
+     my @matches = ($string =~ /$pattern/g);
+     return scalar(@matches);
+ }
+ # Take a string known to have digits and convert all the
+ # digits into letters in the range J,A..I.
+ sub digits_to_letters {
+     my ($input) = @_;
+     my @alphabet = ('J', 'A'..'I');
+     my @input    = split(//, $input);
+     my $output ='';
+     for (my $i = 0; $i < scalar(@input); $i++) {
+ 	if ($input[$i] =~ /\d/) {
+ 	    $output .= $alphabet[$input[$i]];
+ 	} else {
+ 	    $output .= $input[$i];
+ 	}
+     }
+     return $output;
+ }
  =pod
  =item scantron_parse_scanline
- Line 5403  sub scantron_parse_scanline {
+ Line 5528  sub scantron_parse_scanline {
      $questions =~ s/\r$//;      # Get rid of trailing \r too (MAC or Win uploads).
      while (length($questions)) {
  	my $answers_needed = $bubble_lines_per_response{$questnum};
- 	my $answer_length  = $$scantron_config{'Qlength'} * $answers_needed;
+         my $answer_length  = ($$scantron_config{'Qlength'} * $answers_needed)
+                              || 1;
+         $questnum++;
- 	$questnum++;
+         my $quest_id = $questnum;
- 	my $currentquest = substr($questions,0,$answer_length);
+         my $currentquest = substr($questions,0,$answer_length);
- 	$questions       = substr($questions,$answer_length);
+         $questions       = substr($questions,$answer_length);
- 	if (length($currentquest) < $answer_length) { next; }
+         if (length($currentquest) < $answer_length) { next; }
- 	# Qon letter implies for each slot in currentquest we have:
+         if ($subdivided_bubble_lines{$questnum-1} =~ /,/) {
- 	#    ? or * for doubles a letter in A-Z for a bubble and
+             my $subquestnum = 1;
-         #    about anything else (esp. a value of Qoff for missing
+             my $subquestions = $currentquest;
- 	#    bubbles.
+             my @subanswers_needed =
+                 split(/,/,$subdivided_bubble_lines{$questnum-1});
+             foreach my $subans (@subanswers_needed) {
- 	if ($$scantron_config{'Qon'} eq 'letter') {
+                 my $subans_length =
- 	    if ($currentquest =~ /\?/
+                     ($$scantron_config{'Qlength'} * $subans)  || 1;
- 		|| $currentquest =~ /\*/
+                 my $currsubquest = substr($subquestions,0,$subans_length);
- 		|| (&occurence_count($currentquest, "[A-Z]") > 1)) {
+                 $subquestions   = substr($subquestions,$subans_length);
- 		push(@{$record{'scantron.doubleerror'}},$questnum);
+                 $quest_id = "$questnum.$subquestnum";
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+                 if (($$scantron_config{'Qon'} eq 'letter') ||
- 		    my $bubble = substr($currentquest, $ans, 1);
+                     ($$scantron_config{'Qon'} eq 'number')) {
- 		    if ($bubble =~ /[A-Z]/ ) {
+                     $ansnum = &scantron_validator_lettnum($ansnum,
- 			$record{"scantron.$ansnum.answer"} = $bubble;
+                         $questnum,$quest_id,$subans,$currsubquest,$whichline,
- 		    } else {
+                         \@alphabet,\%record,$scantron_config,$scan_data);
- 			$record{"scantron.$ansnum.answer"}='';
+                 } else {
- 		    }
+                     $ansnum = &scantron_validator_positional($ansnum,
- 		    $ansnum++;
+                         $questnum,$quest_id,$subans,$currsubquest,$whichline,                        \@alphabet,\%record,$scantron_config,$scan_data);
- 		}
+                 }
+                 $subquestnum ++;
- 	    } elsif (!defined($currentquest)
+             }
- 		     || (&occurence_count($currentquest, $$scantron_config{'Qoff'}) == length($currentquest))
+         } else {
- 		     || (&occurence_count($currentquest, "[A-Z]") == 0)) {
+             if (($$scantron_config{'Qon'} eq 'letter') ||
- 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+                 ($$scantron_config{'Qon'} eq 'number')) {
- 		    $record{"scantron.$ansnum.answer"}='';
+                 $ansnum = &scantron_validator_lettnum($ansnum,$questnum,
- 		    $ansnum++;
+                     $quest_id,$answers_needed,$currentquest,$whichline,
+                     \@alphabet,\%record,$scantron_config,$scan_data);
- 		}
+             } else {
- 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
+                 $ansnum = &scantron_validator_positional($ansnum,$questnum,
- 		    push(@{$record{"scantron.missingerror"}},$questnum);
+                     $quest_id,$answers_needed,$currentquest,$whichline,
- 		   #  $ansnum += $answers_needed;
+                     \@alphabet,\%record,$scantron_config,$scan_data);
- 		}
+             }
- 	    } else {
+         }
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+     }
- 		    my $bubble = substr($currentquest, $ans, 1);
+     $record{'scantron.maxquest'}=$questnum;
- 		    $record{"scantron.$ansnum.answer"} = $bubble;
+     return \%record;
- 		    $ansnum++;
+ }
- 		}
- 	    }
- 	# Qon 'number' implies each slot gives a digit that indexes the
- 	#    the bubbles filled or Qoff or a non number for unbubbled lines.
-         #    and *? for double bubbles on a line.
- 	#    these answers are also stored as letters.
- 	} elsif ($$scantron_config{'Qon'} eq 'number') {
- 	    if ($currentquest =~ /\?/
- 		|| $currentquest =~ /\*/
- 		|| (&occurence_count($currentquest, '\d') > 1)) {
- 		push(@{$record{'scantron.doubleerror'}},$questnum);
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
- 		    my $bubble = substr($currentquest, $ans, 1);
- 		    if ($bubble =~ /\d/) {
- 			$record{"scantron.$ansnum.answer"} = $alphabet[$bubble];
- 		    } else {
- 			$record{"scantron.$ansnum.answer"}=' ';
- 		    }
- 		    $ansnum++;
- 		}
- 	    } elsif (!defined($currentquest)
- 		     || (&occurence_count($currentquest,$$scantron_config{'Qoff'}) == length($currentquest))
- 		     || (&occurence_count($currentquest, '\d') == 0)) {
- 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
- 		    $record{"scantron.$ansnum.answer"}='';
- 		    $ansnum++;
- 		}
- 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
- 		    push(@{$record{"scantron.missingerror"}},$questnum);
- 		    $ansnum += $answers_needed;
- 		}
- 	    } else {
- 		$currentquest = &digits_to_letters($currentquest);
- 		for (my $ans =0; $ans < $answers_needed; $ans++) {
- 		    $record{"scantron.$ansnum.answer"} = substr($currentquest, $ans, 1);
- 		    $ansnum++;
- 		}
- 	    }
- 	} else {
- 	    # Otherwise there's a positional notation;
+ sub scantron_validator_lettnum {
- 	    # each bubble line requires Qlength items, and there are filled in
+     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,$whichline,
- 	    # bubbles for each case where there 'Qon' characters.
+         $alphabet,$record,$scantron_config,$scan_data) = @_;
- 	    #
+     # Qon 'letter' implies for each slot in currquest we have:
+     #    ? or * for doubles, a letter in A-Z for a bubble, and
+     #    about anything else (esp. a value of Qoff) for missing
+     #    bubbles.
+     #
+     # Qon 'number' implies each slot gives a digit that indexes the
+     #    bubbles filled, or Qoff, or a non-number for unbubbled lines,
+     #    and * or ? for double bubbles on a single line.
+     #
- 	    my @array=split($$scantron_config{'Qon'},$currentquest,-1);
+     my $matchon;
+     if ($$scantron_config{'Qon'} eq 'letter') {
+         $matchon = '[A-Z]';
+     } elsif ($$scantron_config{'Qon'} eq 'number') {
+         $matchon = '\d';
+     }
+     my $occurrences = 0;
+     if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+         ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
+         my @singlelines = split('',$currquest);
+         foreach my $entry (@singlelines) {
+             $occurrences = &occurence_count($entry,$matchon);
+             if ($occurrences > 1) {
+                 last;
+             }
+         }
+     } else {
+         $occurrences = &occurence_count($currquest,$matchon);
+     }
+     if (($currquest =~ /\?/ || $currquest =~ /\*/) || ($occurrences > 1)) {
+         push(@{$record->{'scantron.doubleerror'}},$quest_id);
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             my $bubble = substr($currquest,$ans,1);
+             if ($bubble =~ /$matchon/ ) {
+                 if ($$scantron_config{'Qon'} eq 'number') {
+                     if ($bubble == 0) {
+                         $bubble = 10;
+                     }
+                     $record->{"scantron.$ansnum.answer"} =
+                         $alphabet->[$bubble-1];
+                 } else {
+                     $record->{"scantron.$ansnum.answer"} = $bubble;
+                 }
+             } else {
+                 $record->{"scantron.$ansnum.answer"}='';
+             }
+             $ansnum++;
+         }
+     } elsif (!defined($currquest)
+             || (&occurence_count($currquest, $$scantron_config{'Qoff'}) == length($currquest))
+             || (&occurence_count($currquest,$matchon) == 0)) {
+         for (my $ans=0; $ans<$answers_needed; $ans++ ) {
+             $record->{"scantron.$ansnum.answer"}='';
+             $ansnum++;
+         }
+         if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) {
+             push(@{$record->{'scantron.missingerror'}},$quest_id);
+         }
+     } else {
+         if ($$scantron_config{'Qon'} eq 'number') {
+             $currquest = &digits_to_letters($currquest);
+         }
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             my $bubble = substr($currquest,$ans,1);
+             $record->{"scantron.$ansnum.answer"} = $bubble;
+             $ansnum++;
+         }
+     }
+     return $ansnum;
+ }
- 	    # If the split only  giveas us one element.. the full length of the
+ sub scantron_validator_positional {
- 	    # answser string, no bubbles are filled in:
+     my ($ansnum,$questnum,$quest_id,$answers_needed,$currquest,
+         $whichline,$alphabet,$record,$scantron_config,$scan_data) = @_;
- 	    if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
+     # Otherwise there's a positional notation;
- 		for (my $ans = 0; $ans < $answers_needed; $ans++ ) {
+     # each bubble line requires Qlength items, and there are filled in
- 		    $record{"scantron.$ansnum.answer"}='';
+     # bubbles for each case where there 'Qon' characters.
- 		    $ansnum++;
+     #
- 		}
+     my @array=split($$scantron_config{'Qon'},$currquest,-1);
- 		if (!&scan_data($scan_data,"$whichline.no_bubble.$questnum")) {
- 		    push(@{$record{"scantron.missingerror"}},$questnum);
- 		}
+     # If the split only gives us one element.. the full length of the
+     # answer string, no bubbles are filled in:
- 	    } elsif (scalar(@array) eq 2) {
+     if ($answers_needed eq '') {
+         return;
+     }
- 		my $location      = length($array[0]);
+     if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
- 		my $line_num      = int($location / $$scantron_config{'Qlength'});
+         for (my $ans=0; $ans<$answers_needed; $ans++ ) {
- 		my $bubble        = $alphabet[$location % $$scantron_config{'Qlength'}];
+             $record->{"scantron.$ansnum.answer"}='';
+             $ansnum++;
+         }
+         if (!&scan_data($scan_data,"$whichline.no_bubble.$quest_id")) {
+             push(@{$record->{"scantron.missingerror"}},$quest_id);
+         }
+     } elsif (scalar(@array) == 2) {
+         my $location = length($array[0]);
+         my $line_num = int($location / $$scantron_config{'Qlength'});
+         my $bubble   = $alphabet->[$location % $$scantron_config{'Qlength'}];
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             if ($ans eq $line_num) {
+                 $record->{"scantron.$ansnum.answer"} = $bubble;
+             } else {
+                 $record->{"scantron.$ansnum.answer"} = ' ';
+             }
+             $ansnum++;
+          }
+     } else {
+         #  If there's more than one instance of a bubble character
+         #  That's a double bubble; with positional notation we can
+         #  record all the bubbles filled in as well as the
+         #  fact this response consists of multiple bubbles.
+         #
+         if (($responsetype_per_response{$questnum-1} eq 'essayresponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'formularesponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'stringresponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'imageresponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'reactionresponse') ||
+             ($responsetype_per_response{$questnum-1} eq 'organicresponse')) {
+             my $doubleerror = 0;
+             while (($currquest >= $$scantron_config{'Qlength'}) &&
+                    (!$doubleerror)) {
+                my $currline = substr($currquest,0,$$scantron_config{'Qlength'});
+                $currquest = substr($currquest,$$scantron_config{'Qlength'});
+                my @currarray = split($$scantron_config{'Qon'},$currline,-1);
+                if (length(@currarray) > 2) {
+                    $doubleerror = 1;
+                }
+             }
+             if ($doubleerror) {
+                 push(@{$record->{'scantron.doubleerror'}},$quest_id);
+             }
+         } else {
+             push(@{$record->{'scantron.doubleerror'}},$quest_id);
+         }
+         my $item = $ansnum;
+         for (my $ans=0; $ans<$answers_needed; $ans++) {
+             $record->{"scantron.$item.answer"} = '';
+             $item ++;
+         }
- 		for (my $ans = 0; $ans < $answers_needed; $ans++) {
+         my @ans=@array;
- 		    if ($ans eq $line_num) {
+         my $i=0;
- 			$record{"scantron.$ansnum.answer"} = $bubble;
+         my $increment = 0;
- 		    } else {
+         while ($#ans) {
- 			$record{"scantron.$ansnum.answer"} = ' ';
+             $i+=length($ans[0]) + $increment;
- 		    }
+             my $line   = int($i/$$scantron_config{'Qlength'} + $ansnum);
- 		    $ansnum++;
+             my $bubble = $i%$$scantron_config{'Qlength'};
- 		}
+             $record->{"scantron.$line.answer"}.=$alphabet->[$bubble];
- 	    }
+             shift(@ans);
- 	    #  If there's more than one instance of a bubble character
+             $increment = 1;
- 	    #  That's a double bubble; with positional notation we can
+         }
- 	    #  record all the bubbles filled in as well as the
+         $ansnum += $answers_needed;
- 	    #  fact this response consists of multiple bubbles.
- 	    #
- 	    else {
- 		push(@{$record{'scantron.doubleerror'}},$questnum);
- 		my $first_answer = $ansnum;
- 		for (my $ans =0; $ans < $answers_needed; $ans++) {
- 		    my $item = $first_answer+$ans;
- 		    $record{"scantron.$item.answer"} = '';
- 		}
- 		my @ans=@array;
- 		my $i=0;
- 		my $increment = 0;
- 		while ($#ans) {
- 		    $i+=length($ans[0]) + $increment;
- 		    my $line   = int($i/$$scantron_config{'Qlength'} + $first_answer);
- 		    my $bubble = $i%$$scantron_config{'Qlength'};
- 		    $record{"scantron.$line.answer"}.=$alphabet[$bubble];
- 		    shift(@ans);
- 		    $increment = 1;
- 		}
- 		$ansnum += $answers_needed;
- 	    }
- 	}
      }
-     $record{'scantron.maxquest'}=$questnum;
+     return $ansnum;
-     return \%record;
  }
  =pod
- Line 5702  sub scantron_process_corrections {
+ Line 5879  sub scantron_process_corrections {
  		&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"},
+                                    'questionnum'=>$env{"form.scantron_questionnum_Q_$question"}});
  	    if ($err) { last; }
  	}
      }
- Line 5807  sub remember_current_skipped {
+ Line 5985  sub remember_current_skipped {
  sub check_for_error {
      my ($r,$result)=@_;
      if ($result ne 'ok' && $result ne 'not_found' ) {
- 	$r->print("An error occurred ($result) when trying to Remove the existing corrections.");
+ 	$r->print(&mt("An error occurred ([_1]) when trying to remove the existing corrections.",$result));
      }
  }
- Line 5831  sub scantron_warning_screen {
+ Line 6009  sub scantron_warning_screen {
  	$CODElist=$env{'form.scantron_CODElist'};
  	if ($env{'form.scantron_CODElist'} eq '') { $CODElist='<span class="LC_warning">None</span>'; }
  	$CODElist=
- 	    '<tr><td><b>List of CODES to validate against:</b></td><td><tt>'.
+ 	    '<tr><td><b>'.&mt('List of CODES to validate against:').'</b></td><td><tt>'.
  	    $env{'form.scantron_CODElist'}.'</tt></td></tr>';
      }
-     return (<<STUFF);
+     return ('
  <p>
- <span class="LC_warning">Please double check the information
+ <span class="LC_warning">
-                  below before clicking on '$button_text'</span>
+ '.&mt('Please double check the information below before clicking on \'[_1]\'',&mt($button_text)).'</span>
  </p>
  <table>
- <tr><td><b>Sequence to be Graded:</b></td><td>$title</td></tr>
+ <tr><td><b>'.&mt('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>
+ <tr><td><b>'.&mt('Data File that will be used:').'</b></td><td><tt>'.$env{'form.scantron_selectfile'}.'</tt></td></tr>
- $CODElist
+ '.$CODElist.'
  </table>
  <br />
- <p> If this information is correct, please click on '$button_text'.</p>
+ <p> '.&mt('If this information is correct, please click on \'[_1]\'.',&mt($button_text)).'</p>
- <p> If something is incorrect, please click the 'Grading Menu' button to start over.</p>
+ <p> '.&mt('If something is incorrect, please click the \'Grading Menu\' button to start over.').'</p>
  <br />
- STUFF
+ ');
  }
  =pod
- Line 5870  sub scantron_do_warning {
+ Line 6048  sub scantron_do_warning {
      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>");
+ 	$r->print("<p>".&mt('You have forgetten to specify some information. Please go Back and try again.')."</p>");
  	if ( $env{'form.selectpage'} eq '') {
- 	    $r->print('<p><span class="LC_error">You have not selected a Sequence to grade</span></p>');
+ 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a Sequence to grade').'</span></p>');
  	}
  	if ( $env{'form.scantron_selectfile'} eq '') {
- 	    $r->print('<p><span class="LC_error">You have not selected a file that contains the student\'s response data.</span></p>');
+ 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a file that contains the student\'s response data.').'</span></p>');
  	}
  	if ( $env{'form.scantron_format'} eq '') {
- 	    $r->print('<p><span class="LC_error">You have not selected a the format of the student\'s response data.</span></p>');
+ 	    $r->print('<p><span class="LC_error">'.&mt('You have not selected a the format of the student\'s response data.').'</span></p>');
  	}
      } else {
  	my $warning=&scantron_warning_screen('Grading: Validate Records');
- 	$r->print(<<STUFF);
+ 	$r->print('
- $warning
+ '.$warning.'
- <input type="submit" name="submit" value="Grading: Validate Records" />
+ <input type="submit" name="submit" value="'.&mt('Grading: Validate Records').'" />
  <input type="hidden" name="command" value="scantron_validate" />
- STUFF
+ ');
      }
      $r->print("</form><br />".&show_grading_menu_form($symb));
      return '';
- Line 5921  SCANTRONFORM
+ Line 6099  SCANTRONFORM
  	   '<input type="hidden" name="scantron.bubblelines.'.$line.'" value="'.$env{"form.scantron.bubblelines.$line"}.'" />'."\n";
         $chunk .=
  	   '<input type="hidden" name="scantron.first_bubble_line.'.$line.'" value="'.$env{"form.scantron.first_bubble_line.$line"}.'" />'."\n";
+        $chunk .=
+            '<input type="hidden" name="scantron.sub_bubblelines.'.$line.'" value="'.$env{"form.scantron.sub_bubblelines.$line"}.'" />'."\n";
+        $chunk .=
+            '<input type="hidden" name="scantron.responsetype.'.$line.'" value="'.$env{"form.scantron.responsetype.$line"}.'" />'."\n";
         $result .= $chunk;
         $line++;
     }
- Line 5965  sub scantron_validate_file {
+ Line 6147  sub scantron_validate_file {
      if ($env{'form.scantron_corrections'}) {
  	&scantron_process_corrections($r);
      }
-     $r->print("<p>Gathering necessary info.</p>");$r->rflush();
+     $r->print('<p>'.&mt('Gathering necessary information.').'</p>');$r->rflush();
      #get the student pick code ready
      $r->print(&Apache::loncommon::studentbrowser_javascript());
      my $max_bubble=&scantron_get_maxbubble();
- Line 5985  sub scantron_validate_file {
+ Line 6167  sub scantron_validate_file {
      my $stop=0;
      while (!$stop && $currentphase < scalar(@validate_phases)) {
- 	$r->print("<p> Validating ".$validate_phases[$currentphase]."</p>");
+ 	$r->print(&mt('Validating '.$validate_phases[$currentphase]).'<br />');
  	$r->rflush();
  	my $which="scantron_validate_".$validate_phases[$currentphase];
  	{
- Line 5995  sub scantron_validate_file {
+ Line 6177  sub scantron_validate_file {
      }
      if (!$stop) {
  	my $warning=&scantron_warning_screen('Start Grading');
- 	$r->print(<<STUFF);
+ 	$r->print(&mt('Validation process complete.').'<br />'.
- Validation process complete.<br />
+                   $warning.
- $warning
+                   &mt('Perform verification for each student after storage of submissions?').
- <input type="submit" name="submit" value="Start Grading" />
+                   '&nbsp;<span class="LC_nobreak"><label>'.
- <input type="hidden" name="command" value="scantron_process" />
+                   '<input type="radio" name="verifyrecord" value="1" />'.&mt('Yes').'</label>'.
- STUFF
+                   ('&nbsp;'x3).'<label>'.
+                   '<input type="radio" name="verifyrecord" value="0" checked="checked" />'.&mt('No').
+                   '</label></span><br />'.
+                   &mt('Grading will take longer if you use verification.').'<br />'.
+                   &mt("Alternatively, the 'Review scantron data' utility (see grading menu) can be used for all students after grading is complete.").'<br /><br />'.
+                   '<input type="submit" name="submit" value="'.&mt('Start Grading').'" />'.
+                   '<input type="hidden" name="command" value="scantron_process" />'."\n");
      } else {
  	$r->print('<input type="hidden" name="command" value="scantron_validate" />');
  	$r->print("<input type='hidden' name='validatepass' value='".$currentphase."' />");
      }
      if ($stop) {
  	if ($validate_phases[$currentphase] eq 'sequence') {
- 	    $r->print('<input type="submit" name="submit" value="Ignore -> " />');
+ 	    $r->print('<input type="submit" name="submit" value="'.&mt('Ignore').' &rarr; " />');
- 	    $r->print(' this error <br />');
+ 	    $r->print(' '.&mt('this error').' <br />');
- 	    $r->print(" <p>Or click the 'Grading Menu' button to start over.</p>");
+ 	    $r->print(" <p>".&mt("Or click the 'Grading Menu' button to start over.")."</p>");
  	} else {
- 	    $r->print('<input type="submit" name="submit" value="Continue ->" />');
+             if ($validate_phases[$currentphase] eq 'doublebubble' || $validate_phases[$currentphase] eq 'missingbubbles') {
- 	    $r->print(' using corrected info <br />');
+ 	        $r->print('<input type="button" name="submitbutton" value="'.&mt('Continue').' &rarr;" onclick="javascript:verify_bubble_radio(this.form)" />');
- 	    $r->print("<input type='submit' value='Skip' name='scantron_skip_record' />");
+             } else {
- 	    $r->print(" this scanline saving it for later.");
+                 $r->print('<input type="submit" name="submit" value="'.&mt('Continue').' &rarr;" />');
+             }
+ 	    $r->print(' '.&mt('using corrected info').' <br />');
+ 	    $r->print("<input type='submit' value='".&mt("Skip")."' name='scantron_skip_record' />");
+ 	    $r->print(" ".&mt("this scanline saving it for later."));
  	}
      }
      $r->print(" </form><br />".&show_grading_menu_form($symb));
- Line 6390  sub scantron_validate_sequence {
+ Line 6581  sub scantron_validate_sequence {
      return (0,$currentphase+1);
  }
- =pod
- =item scantron_validate_ID
-    Validates all scanlines in the selected file to not have any
-    invalid or underspecified student IDs
- =cut
  sub scantron_validate_ID {
      my ($r,$currentphase) = @_;
- Line 6463  sub scantron_validate_ID {
+ Line 6647  sub scantron_validate_ID {
      return (0,$currentphase+1);
  }
- =pod
- =item scantron_get_correction
-    Builds the interface screen to interact with the operator to fix a
-    specific error condition in a specific scanline
-  Arguments:
-     $r           - Apache request object
-     $i           - number of the current scanline
-     $scan_record - hash ref as returned from &scantron_parse_scanline()
-     $scan_config - hash ref as returned from &get_scantron_config()
-     $line        - full contents of the current scanline
-     $error       - error condition, valid values are
-                    'incorrectCODE', 'duplicateCODE',
-                    'doublebubble', 'missingbubble',
-                    'duplicateID', 'incorrectID'
-     $arg         - extra information needed
-        For errors:
-          - duplicateID   - paper number that this studentID was seen before on
-          - duplicateCODE - array ref of the paper numbers this CODE was
-                            seen on before
-          - incorrectCODE - current incorrect CODE
-          - doublebubble  - array ref of the bubble lines that have double
-                            bubble errors
-          - missingbubble - array ref of the bubble lines that have missing
-                            bubble errors
- =cut
  sub scantron_get_correction {
      my ($r,$i,$scan_record,$scan_config,$line,$error,$arg)=@_;
  #FIXME in the case of a duplicated ID the previous line, probably need
  #to show both the current line and the previous one and allow skipping
  #the previous one or the current one
-     $r->print("<p><b>An error was detected ($error)</b>");
      if ( $$scan_record{'scantron.PaperID'} =~ /\S/) {
- 	$r->print(" for PaperID <tt>".
+ 	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
- 		  $$scan_record{'scantron.PaperID'}."</tt> \n");
+ 			    " for PaperID <tt>[_1]</tt>",
+ 			    $$scan_record{'scantron.PaperID'})."</p> \n");
      } else {
- 	$r->print(" in scanline $i <pre>".
+ 	$r->print("<p>".&mt("<b>An error was detected ($error)</b>".
- 		  $line."</pre> \n");
+ 			    " in scanline [_1] <pre>[_2]</pre>",
-     }
+ 			    $i,$line)."</p> \n");
-     my $message="<p>The ID on the form is  <tt>".
+     }
- 	$$scan_record{'scantron.ID'}."</tt><br />\n".
+     my $message="<p>".&mt("The ID on the form is  <tt>[_1]</tt><br />".
- 	"The name on the paper is ".
+ 			  "The name on the paper is [_2],[_3]",
- 	$$scan_record{'scantron.LastName'}.",".
+ 			  $$scan_record{'scantron.ID'},
- 	$$scan_record{'scantron.FirstName'}."</p>";
+ 			  $$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");
+                            # Array populated for doublebubble or
+     my @lines_to_correct;  # missingbubble errors to build javascript
+                            # to validate radio button checking
      if ($error =~ /ID$/) {
  	if ($error eq 'incorrectID') {
- 	    $r->print("The encoded ID is not in the classlist</p>\n");
+ 	    $r->print("<p>".&mt("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>".&mt("The encoded ID has also been used by a previous paper [_1]",$arg)."</p>\n");
  	}
  	$r->print($message);
- 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
  	$r->print("\n<ul><li> ");
  	#FIXME it would be nice if this sent back the user ID and
  	#could do partial userID matches
- Line 6536  sub scantron_get_correction {
+ Line 6696  sub scantron_get_correction {
  	$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");
+ 	    $r->print("<p>".&mt("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>".&mt("The encoded CODE has also been used by a previous paper [_1], and CODEs are supposed to be unique.",join(', ',@{$arg}))."</p>\n");
  	}
- 	$r->print("<p>The CODE on the form is  <tt>'".
+ 	$r->print("<p>".&mt("The CODE on the form is  <tt>'[_1]'</tt>",
- 		  $$scan_record{'scantron.CODE'}."'</tt><br />\n");
+ 			    $$scan_record{'scantron.CODE'})."<br />\n");
  	$r->print($message);
- 	$r->print("<p>How should I handle this? <br /> \n");
+ 	$r->print("<p>".&mt("How should I handle this?")." <br /> \n");
  	$r->print("\n<br /> ");
  	my $i=0;
  	if ($error eq 'incorrectCODE'
- Line 6553  sub scantron_get_correction {
+ Line 6713  sub scantron_get_correction {
  		foreach my $testcode (@{$closest}) {
  		    my $checked='';
  		    if (!$i) { $checked=' checked="checked" '; }
- 		    $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("
+    <label>
+        <input type='radio' name='scantron_CODE_resolution' value='use_closest_$i' $checked />
+        ".&mt("Use the similar CODE [_1] instead.",
+ 	    "<b><tt>".$testcode."</tt></b>")."
+     </label>
+     <input type='hidden' name='scantron_CODE_closest_$i' value='$testcode' />");
  		    $r->print("\n<br />");
  		    $i++;
  		}
- Line 6561  sub scantron_get_correction {
+ Line 6727  sub scantron_get_correction {
  	}
  	if ($$scan_record{'scantron.CODE'}=~/\S/ ) {
  	    my $checked; if (!$i) { $checked=' checked="checked" '; }
- 	    $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("
+     <label>
+         <input type='radio' name='scantron_CODE_resolution' value='use_unfound' $checked />
+        ".&mt("Use the CODE [_1] that is was on the paper, ignoring the error.",
+ 	     "<b><tt>".$$scan_record{'scantron.CODE'}."</tt></b>")."
+     </label>");
  	    $r->print("\n<br />");
  	}
- Line 6583  ENDSCRIPT
+ Line 6754  ENDSCRIPT
  	   "&curCODE=".&escape($$scan_record{'scantron.CODE'}).
  	   "&scantron_selectfile=".&escape($env{'form.scantron_selectfile'});
  	if ($env{'form.scantron_CODElist'} =~ /\S/) {
- 	    $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("
+     <label>
+        <input type='radio' name='scantron_CODE_resolution' value='use_found' />
+        ".&mt("[_1]Select[_2] a CODE from the list of all CODEs and use it.",
+ 	     "<a target='_blank' href='$href'>","</a>")."
+     </label>
+     ".&mt("Selected CODE is [_1]","<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("
+     <label>
+        <input type='radio' name='scantron_CODE_resolution' value='use_typed' />
+        ".&mt("Use [_1] as the CODE.",
+ 	     "</label><input type='text' size='8' name='scantron_CODE_newvalue' onfocus=\"javascript:change_radio('use_typed')\" onkeypress=\"javascript:change_radio('use_typed')\" />"));
  	$r->print("\n<br /><br />");
      } elsif ($error eq 'doublebubble') {
- 	$r->print("<p>There have been multiple bubbles scanned for a some question(s)</p>\n");
+ 	$r->print("<p>".&mt("There have been multiple bubbles scanned for some question(s)")."</p>\n");
+ 	# The form field scantron_questions is acutally a list of line numbers.
+ 	# represented by this form so:
+ 	my $line_list = &questions_to_line_list($arg);
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
- 		  join(',',@{$arg}).'" />');
+ 		  $line_list.'" />');
  	$r->print($message);
- 	$r->print("<p>Please indicate which bubble should be used for grading</p>");
+ 	$r->print("<p>".&mt("Please indicate which bubble should be used for grading")."</p>");
  	foreach my $question (@{$arg}) {
- 	    my $selected  = &get_response_bubbles($scan_record, $question);
+ 	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
- 	    my @select_array = split(/:/,$selected);
+                                                    $scan_record, $error);
- 	    &scantron_bubble_selector($r,$scan_config,$question,
+             push(@lines_to_correct,@linenums);
- 				      @select_array);
  	}
+         $r->print(&verify_bubbles_checked(@lines_to_correct));
      } elsif ($error eq 'missingbubble') {
- 	$r->print("<p>There have been <b>no</b> bubbles scanned for some question(s)</p>\n");
+ 	$r->print("<p>".&mt("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("<p>".&mt("Please indicate which bubble should be used for grading.")."</p>");
- 	$r->print("Some questions have no scanned bubbles\n");
+ 	$r->print(&mt("Some questions have no scanned bubbles.")."\n");
+ 	# The form field scantron_questions is actually a list of line numbers not
+ 	# a list of question numbers. Therefore:
+ 	#
+ 	my $line_list = &questions_to_line_list($arg);
  	$r->print('<input type="hidden" name="scantron_questions" value="'.
- 		  join(',',@{$arg}).'" />');
+ 		  $line_list.'" />');
  	foreach my $question (@{$arg}) {
- 	    my $selected = &get_response_bubbles($scan_record, $question);
+ 	    my @linenums = &prompt_for_corrections($r,$question,$scan_config,
- 	    my @select_array = split(/:/,$selected); # ought to be an array of empties.
+                                                    $scan_record, $error);
- 	    &scantron_bubble_selector($r,$scan_config,$question, @select_array);
+             push(@lines_to_correct,@linenums);
  	}
+         $r->print(&verify_bubbles_checked(@lines_to_correct));
      } else {
  	$r->print("\n<ul>");
      }
      $r->print("\n</li></ul>");
+ }
+ sub verify_bubbles_checked {
+     my (@ansnums) = @_;
+     my $ansnumstr = join('","',@ansnums);
+     my $warning = &mt("A bubble or 'No bubble' selection has not been made for one or more lines.");
+     my $output = (<<ENDSCRIPT);
+ <script type="text/javascript">
+ function verify_bubble_radio(form) {
+     var ansnumArray = new Array ("$ansnumstr");
+     var need_bubble_count = 0;
+     for (var i=0; i<ansnumArray.length; i++) {
+         if (form.elements["scantron_correct_Q_"+ansnumArray[i]].length > 1) {
+             var bubble_picked = 0;
+             for (var j=0; j<form.elements["scantron_correct_Q_"+ansnumArray[i]].length; j++) {
+                 if (form.elements["scantron_correct_Q_"+ansnumArray[i]][j].checked == true) {
+                     bubble_picked = 1;
+                 }
+             }
+             if (bubble_picked == 0) {
+                 need_bubble_count ++;
+             }
+         }
+     }
+     if (need_bubble_count) {
+         alert("$warning");
+         return;
+     }
+     form.submit();
+ }
+ </script>
+ ENDSCRIPT
+     return $output;
  }
  =pod
- =item scantron_bubble_selector
+ =item  questions_to_line_list
-    Generates the html radiobuttons to correct a single bubble line
-    possibly showing the existing the selected bubbles if known
-  Arguments:
+ Converts a list of questions into a string of comma separated
-     $r           - Apache request object
+ line numbers in the answer sheet used by the questions.  This is
-     $scan_config - hash from &get_scantron_config()
+ used to fill in the scantron_questions form field.
-     $quest       - number of the bubble line to make a corrector for
-     @lines       - array of answer lines.
- =cut
+   Arguments:
+      questions    - Reference to an array of questions.
- sub scantron_bubble_selector {
+ =cut
-     my ($r,$scan_config,$quest,@lines)=@_;
-     my $max=$$scan_config{'Qlength'};
-     my $scmode=$$scan_config{'Qon'};
+ sub questions_to_line_list {
+     my ($questions) = @_;
+     my @lines;
+     foreach my $item (@{$questions}) {
+         my $question = $item;
+         my ($first,$count,$last);
+         if ($item =~ /^(\d+)\.(\d+)$/) {
+             $question = $1;
+             my $subquestion = $2;
+             $first = $first_bubble_line{$question-1} + 1;
+             my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+             my $subcount = 1;
+             while ($subcount<$subquestion) {
+                 $first += $subans[$subcount-1];
+                 $subcount ++;
+             }
+             $count = $subans[$subquestion-1];
+         } else {
+ 	    $first   = $first_bubble_line{$question-1} + 1;
+ 	    $count   = $bubble_lines_per_response{$question-1};
+         }
+         $last = $first+$count-1;
+         push(@lines, ($first..$last));
+     }
+     return join(',', @lines);
+ }
-     my $bubble_length = scalar(@lines);
+ =pod
+ =item prompt_for_corrections
-     if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
+ Prompts for a potentially multiline correction to the
+ user's bubbling (factors out common code from scantron_get_correction
+ for multi and missing bubble cases).
-     my $response = $quest-1;
+  Arguments:
-     my $lines = $bubble_lines_per_response{$response};
+    $r           - Apache request object.
+    $question    - The question number to prompt for.
+    $scan_config - The scantron file configuration hash.
+    $scan_record - Reference to the hash that has the the parsed scanlines.
+    $error       - Type of error
+  Implicit inputs:
+    %bubble_lines_per_response   - Starting line numbers for each question.
+                                   Numbered from 0 (but question numbers are from
+.
+    %first_bubble_line           - Starting bubble line for each question.
+    %subdivided_bubble_lines     - optionresponse, matchresponse and rankresponse
+                                   type problems render as separate sub-questions,
+                                   in exam mode. This hash contains a
+                                   comma-separated list of the lines per
+                                   sub-question.
+    %responsetype_per_response   - essayresponse, formularesponse,
+                                   stringresponse, imageresponse, reactionresponse,
+                                   and organicresponse type problem parts can have
+                                   multiple lines per response if the weight
+                                   assigned exceeds 10.  In this case, only
+                                   one bubble per line is permitted, but more
+                                   than one line might contain bubbles, e.g.
+                                   bubbling of: line 1 - J, line 2 - J,
+                                   line 3 - B would assign 22 points.
-     my $total_lines = $lines*2;
+ =cut
-     my @alphabet=('A'..'Z');
-     $r->print("<table border='1'><tr><td rowspan='".$total_lines."'>$quest</td>");
+ sub prompt_for_corrections {
+     my ($r, $question, $scan_config, $scan_record, $error) = @_;
+     my ($current_line,$lines);
+     my @linenums;
+     my $questionnum = $question;
+     if ($question =~ /^(\d+)\.(\d+)$/) {
+         $question = $1;
+         $current_line = $first_bubble_line{$question-1} + 1 ;
+         my $subquestion = $2;
+         my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+         my $subcount = 1;
+         while ($subcount<$subquestion) {
+             $current_line += $subans[$subcount-1];
+             $subcount ++;
+         }
+         $lines = $subans[$subquestion-1];
+     } else {
+         $current_line = $first_bubble_line{$question-1} + 1 ;
+         $lines        = $bubble_lines_per_response{$question-1};
+     }
+     if ($lines > 1) {
+         $r->print(&mt('The group of bubble lines below responds to a single question.').'<br />');
+         if (($responsetype_per_response{$question-1} eq 'essayresponse') ||
+             ($responsetype_per_response{$question-1} eq 'formularesponse') ||
+             ($responsetype_per_response{$question-1} eq 'stringresponse') ||
+             ($responsetype_per_response{$question-1} eq 'imageresponse') ||
+             ($responsetype_per_response{$question-1} eq 'reactionresponse') ||
+             ($responsetype_per_response{$question-1} eq 'organicresponse')) {
+             $r->print(&mt("Although this particular question type requires handgrading, the instructions for this question in the exam directed students to leave [quant,_1,line] blank on their scantron sheets.",$lines).'<br /><br />'.&mt('A non-zero score can be assigned to the student during scantron grading by selecting a bubble in at least one line.').'<br />'.&mt('The score for this question will be a sum of the numeric values for the selected bubbles from each line, where A=1 point, B=2 points etc.').'<br />'.&mt("To assign a score of zero for this question, mark all lines as 'No bubble'.").'<br /><br />');
+         } else {
+             $r->print(&mt("Select at most one bubble in a single line and select 'No Bubble' in all the other lines. ")."<br />");
+         }
+     }
+     for (my $i =0; $i < $lines; $i++) {
+         my $selected = $$scan_record{"scantron.$current_line.answer"};
+ 	&scantron_bubble_selector($r,$scan_config,$current_line,
+ 	        		  $questionnum,$error,split('', $selected));
+         push(@linenums,$current_line);
+ 	$current_line++;
+     }
+     if ($lines > 1) {
+ 	$r->print("<hr /><br />");
+     }
+     return @linenums;
+ }
-     for (my $l = 0; $l < $lines; $l++) {
+ =pod
- 	if ($l != 0) {
- 	    $r->print('<tr>');
- 	}
- 	my @selected = split(//,$lines[$l]);
- 	for (my $i=0;$i<$max;$i++) {
- 	    $r->print("\n".'<td align="center">');
- 	    if ($selected[0] eq $alphabet[$i]) {
- 		$r->print('X');
- 		shift(@selected) ;
- 	    } else {
- 		$r->print('&nbsp;');
- 	    }
- 	    $r->print('</td>');
- 	}
- 	if ($l == 0) {
+ =item scantron_bubble_selector
- 	    my $lspan = $total_lines * 2;   #  2 table rows per bubble line.
+    Generates the html radiobuttons to correct a single bubble line
+    possibly showing the existing the selected bubbles if known
- 	    $r->print('<td rowspan='.$lspan.'><label><input type="radio" name="scantron_correct_Q_'.
+  Arguments:
- 	      $quest.'" value="none" /> No bubble </label></td>');
+     $r           - Apache request object
+     $scan_config - hash from &get_scantron_config()
- 	}
+     $line        - Number of the line being displayed.
+     $questionnum - Question number (may include subquestion)
+     $error       - Type of error.
+     @selected    - Array of bubbles picked on this line.
- 	$r->print('</tr><tr>');
+ =cut
- 	# FIXME: This may have to be a bit more clever for
+ sub scantron_bubble_selector {
- 	#        multiline questions (different values e.g..).
+     my ($r,$scan_config,$line,$questionnum,$error,@selected)=@_;
+     my $max=$$scan_config{'Qlength'};
- 	for (my $i=0;$i<$max;$i++) {
+     my $scmode=$$scan_config{'Qon'};
- 	    my $value = "$l:$i";	# Relative bubble line #: Bubble in line.
+     if ($scmode eq 'number' || $scmode eq 'letter') { $max=10; }
- 	    $r->print("\n".
- 		      '<td><label><input type="radio" name="scantron_correct_Q_'.
- 		      $quest.'" value="'.$value.'" />'.$alphabet[$i]."</label></td>");
- 	}
- 	$r->print('</tr>');
+     my @alphabet=('A'..'Z');
-     }
+     $r->print(&Apache::loncommon::start_data_table().
-     $r->print('</table>');
+               &Apache::loncommon::start_data_table_row());
+     $r->print('<td rowspan="2" class="LC_leftcol_header">'.$line.'</td>');
+     for (my $i=0;$i<$max+1;$i++) {
+ 	$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(&Apache::loncommon::end_data_table_row().
+               &Apache::loncommon::start_data_table_row());
+     for (my $i=0;$i<$max;$i++) {
+ 	$r->print("\n".
+ 		  '<td><label><input type="radio" name="scantron_correct_Q_'.
+ 		  $line.'" value="'.$i.'" />'.$alphabet[$i]."</label></td>");
+     }
+     my $nobub_checked = ' ';
+     if ($error eq 'missingbubble') {
+         $nobub_checked = ' checked = "checked" ';
+     }
+     $r->print("\n".'<td><label><input type="radio" name="scantron_correct_Q_'.
+ 	      $line.'" value="none"'.$nobub_checked.'/>'.&mt('No bubble').
+               '</label>'."\n".'<input type="hidden" name="scantron_questionnum_Q_'.
+               $line.'" value="'.$questionnum.'" /></td>');
+     $r->print(&Apache::loncommon::end_data_table_row().
+               &Apache::loncommon::end_data_table());
  }
  =pod
- Line 6851  sub scantron_validate_CODE {
+ Line 7178  sub scantron_validate_CODE {
  				     $line,'duplicateCODE',$usedCODEs{$CODE});
  	    return(1,$currentphase);
  	}
- 	push (@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
+ 	push(@{$usedCODEs{$CODE}},$$scan_record{'scantron.PaperID'});
      }
      return (0,$currentphase+1);
  }
- Line 6874  sub scantron_validate_doublebubble {
+ Line 7201  sub scantron_validate_doublebubble {
      #get scantron line setup
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
      my ($scanlines,$scan_data)=&scantron_getfile();
      &scantron_get_maxbubble();	# parse needs the bubble line array.
      for (my $i=0;$i<=$scanlines->{'count'};$i++) {
- Line 6891  sub scantron_validate_doublebubble {
+ Line 7217  sub scantron_validate_doublebubble {
      return (0,$currentphase+1);
  }
- =pod
- =item scantron_get_maxbubble
-    Returns the maximum number of bubble lines that are expected to
-    occur. Does this by walking the selected sequence rendering the
-    resource and then checking &Apache::lonxml::get_problem_counter()
-    for what the current value of the problem counter is.
-    Caches the results to $env{'form.scantron_maxbubble'},
-    $env{'form.scantron.bubble_lines.n'} and
-    $env{'form.scantron.first_bubble_line.n'}
-    which are the total number of bubble, lines, the number of bubble
-    lines for reponse n and number of the first bubble line for response n.
- =cut
  sub scantron_get_maxbubble {
      if (defined($env{'form.scantron_maxbubble'}) &&
  	$env{'form.scantron_maxbubble'}) {
  	&restore_bubble_lines();
- Line 6930  sub scantron_get_maxbubble {
+ Line 7240  sub scantron_get_maxbubble {
      my $total_lines = 0;
      %bubble_lines_per_response = ();
      %first_bubble_line         = ();
+     %subdivided_bubble_lines   = ();
+     %responsetype_per_response = ();
      my $response_number = 0;
      my $bubble_line     = 0;
      foreach my $resource (@resources) {
- 	my $symb = $resource->symb();
+         my ($analysis,$parts) = &scantron_partids_tograde($resource,$cid,$uname,$udom);
- 	&Apache::lonxml::clear_bubble_lines_for_part();
+         if ((ref($analysis) eq 'HASH') && (ref($parts) eq 'ARRAY')) {
- 	my $result=&Apache::lonnet::ssi($resource->src(),
+ 	    foreach my $part_id (@{$parts}) {
- 					('symb' => $resource->symb()),
+                 my $lines;
- 					('grade_target' => 'analyze'),
- 					('grade_courseid' => $cid),
+ 	        # TODO - make this a persistent hash not an array.
- 					('grade_domain' => $udom),
- 					('grade_username' => $uname));
+                 # optionresponse, matchresponse and rankresponse type items
- 	my (undef, $an) =
+                 # render as separate sub-questions in exam mode.
- 	    split(/_HASH_REF__/,$result, 2);
+                 if (($analysis->{$part_id.'.type'} eq 'optionresponse') ||
+                     ($analysis->{$part_id.'.type'} eq 'matchresponse') ||
- 	my %analysis = &Apache::lonnet::str2hash($an);
+                     ($analysis->{$part_id.'.type'} eq 'rankresponse')) {
+                     my ($numbub,$numshown);
+                     if ($analysis->{$part_id.'.type'} eq 'optionresponse') {
+                         if (ref($analysis->{$part_id.'.options'}) eq 'ARRAY') {
- 	foreach my $part_id (@{$analysis{'parts'}}) {
+                             $numbub = scalar(@{$analysis->{$part_id.'.options'}});
+                         }
- 	    my $lines = $analysis{"$part_id.bubble_lines"};;
+                     } elsif ($analysis->{$part_id.'.type'} eq 'matchresponse') {
+                         if (ref($analysis->{$part_id.'.items'}) eq 'ARRAY') {
+                             $numbub = scalar(@{$analysis->{$part_id.'.items'}});
+                         }
- 	    # TODO - make this a persistent hash not an array.
+                     } elsif ($analysis->{$part_id.'.type'} eq 'rankresponse') {
+                         if (ref($analysis->{$part_id.'.foils'}) eq 'ARRAY') {
+                             $numbub = scalar(@{$analysis->{$part_id.'.foils'}});
- 	    $first_bubble_line{$response_number}           = $bubble_line;
+                         }
- 	    $bubble_lines_per_response{$response_number}   = $lines;
+                     }
- 	    $response_number++;
+                     if (ref($analysis->{$part_id.'.shown'}) eq 'ARRAY') {
+                         $numshown = scalar(@{$analysis->{$part_id.'.shown'}});
+                     }
+                     my $bubbles_per_line = 10;
+                     my $inner_bubble_lines = int($numbub/$bubbles_per_line);
+                     if (($numbub % $bubbles_per_line) != 0) {
+                         $inner_bubble_lines++;
+                     }
+                     for (my $i=0; $i<$numshown; $i++) {
+                         $subdivided_bubble_lines{$response_number} .=
+                             $inner_bubble_lines.',';
+                     }
+                     $subdivided_bubble_lines{$response_number} =~ s/,$//;
+                     $lines = $numshown * $inner_bubble_lines;
+                 } else {
+                     $lines = $analysis->{"$part_id.bubble_lines"};
+                 }
- 	    $bubble_line +=  $lines;
+                 $first_bubble_line{$response_number} = $bubble_line;
- 	    $total_lines +=  $lines;
+ 	        $bubble_lines_per_response{$response_number} = $lines;
- 	}
+                 $responsetype_per_response{$response_number} =
+                     $analysis->{$part_id.'.type'};
+ 	        $response_number++;
+ 	        $bubble_line +=  $lines;
+ 	        $total_lines +=  $lines;
+ 	    }
+         }
      }
      &Apache::lonnet::delenv('scantron\.');
- Line 6976  sub scantron_get_maxbubble {
+ Line 7309  sub scantron_get_maxbubble {
      return $env{'form.scantron_maxbubble'};
  }
- =pod
+ sub scantron_partids_tograde {
+     my ($resource,$cid,$uname,$udom) = @_;
- =item scantron_validate_missingbubbles
+     my (%analysis,@parts);
-    Validates all scanlines in the selected file to not have any
+     if (ref($resource)) {
-     answers that don't have bubbles that have not been verified
+         my $symb = $resource->symb();
-     to be bubble free.
+         my $result=&ssi_with_retries($resource->src(), $ssi_retries,
+                                         ('symb' => $symb,
- =cut
+                                          'grade_target' => 'analyze',
+                                          'grade_courseid' => $cid,
+                                          'grade_domain' => $udom,
+                                          'grade_username' => $uname));
+         my (undef, $an) = split(/_HASH_REF__/,$result, 2);
+         %analysis = &Apache::lonnet::str2hash($an);
+         if (ref($analysis{'parts'}) eq 'ARRAY') {
+             foreach my $part (@{$analysis{'parts'}}) {
+                 my ($id,$respid) = split(/\./,$part);
+                 if (!&Apache::loncommon::check_if_partid_hidden($id,$symb,$udom,$uname)) {
+                     push(@parts,$part);
+                 }
+             }
+         }
+     }
+     return (\%analysis,\@parts);
+ }
  sub scantron_validate_missingbubbles {
      my ($r,$currentphase) = @_;
- Line 7008  sub scantron_validate_missingbubbles {
+ Line 7358  sub scantron_validate_missingbubbles {
  	# Probably here's where the error is...
  	foreach my $missing (@{$$scan_record{'scantron.missingerror'}}) {
- 	    if ($missing > $max_bubble) { next; }
+             my $lastbubble;
+             if ($missing =~ /^(\d+)\.(\d+)$/) {
+                my $question = $1;
+                my $subquestion = $2;
+                if (!defined($first_bubble_line{$question -1})) { next; }
+                my $first = $first_bubble_line{$question-1};
+                my @subans = split(/,/,$subdivided_bubble_lines{$question-1});
+                my $subcount = 1;
+                while ($subcount<$subquestion) {
+                    $first += $subans[$subcount-1];
+                    $subcount ++;
+                }
+                my $count = $subans[$subquestion-1];
+                $lastbubble = $first + $count;
+             } else {
+                 if (!defined($first_bubble_line{$missing - 1})) { next; }
+                 $lastbubble = $first_bubble_line{$missing - 1} + $bubble_lines_per_response{$missing - 1};
+             }
+             if ($lastbubble > $max_bubble) { next; }
  	    push(@to_correct,$missing);
  	}
  	if (@to_correct) {
- Line 7021  sub scantron_validate_missingbubbles {
+ Line 7389  sub scantron_validate_missingbubbles {
      return (0,$currentphase+1);
  }
- =pod
- =item scantron_process_students
-    Routine that does the actual grading of the bubble sheet information.
-    The parsed scanline hash is added to %env
-    Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
-    foreach resource , with the form data of
- 	'submitted'     =>'scantron'
- 	'grade_target'  =>'grade',
- 	'grade_username'=> username of student
- 	'grade_domain'  => domain of student
- 	'grade_courseid'=> of course
- 	'grade_symb'    => symb of resource to grade
-     This triggers a grading pass. The problem grading code takes care
-     of converting the bubbled letter information (now in %env) into a
-     valid submission.
- =cut
  sub scantron_process_students {
      my ($r) = @_;
      my (undef,undef,$sequence)=&Apache::lonnet::decode_symb($env{'form.selectpage'});
      my ($symb)=&get_symb($r);
-     if (!$symb) {return '';}
+     if (!$symb) {
+ 	return '';
+     }
      my $default_form_data=&defaultFormData($symb);
      my %scantron_config=&get_scantron_config($env{'form.scantron_format'});
- Line 7059  sub scantron_process_students {
+ Line 7407  sub scantron_process_students {
      my $navmap=Apache::lonnavmaps::navmap->new();
      my $map=$navmap->getResourceByUrl($sequence);
      my @resources=$navmap->retrieveResources($map,\&scantron_filter,1,0);
+     my ($uname,$udom,%partids_by_symb);
+     foreach my $resource (@resources) {
+         my $ressymb = $resource->symb();
+         my ($analysis,$parts) =
+             &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
+         $partids_by_symb{$ressymb} = $parts;
+     }
  #    $r->print("geto ".scalar(@resources)."<br />");
      my $result= <<SCANTRONFORM;
  <form method="post" enctype="multipart/form-data" action="/adm/grades" name="scantronupload">
- Line 7068  SCANTRONFORM
+ Line 7424  SCANTRONFORM
      $r->print($result);
      my @delayqueue;
-     my %completedstudents;
+     my (%completedstudents,%scandata);
+     my $lock=&Apache::lonnet::set_lock(&mt('Grading bubblesheet exam'));
      my $count=&get_todo_count($scanlines,$scan_data);
      my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron Status',
   				    'Scantron Progress',$count,
  				    'inline',undef,'scantronupload');
      &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
  					  'Processing first student');
+     $r->print('<br />');
      my $start=&Time::HiRes::time();
      my $i=-1;
-     my ($uname,$udom,$started);
+     my $started;
      &scantron_get_maxbubble();	# Need the bubble lines array to parse.
+     # If an ssi failed in scantron_get_maxbubble, put an error message out to
+     # the user and return.
+     if ($ssi_error) {
+ 	$r->print("</form>");
+ 	&ssi_print_error($r);
+ 	$r->print(&show_grading_menu_form($symb));
+         &Apache::lonnet::remove_lock($lock);
+ 	return '';		# Dunno why the other returns return '' rather than just returning.
+     }
+     my %lettdig = &letter_to_digits();
+     my $numletts = scalar(keys(%lettdig));
      while ($i<$scanlines->{'count'}) {
   	($uname,$udom)=('','');
- Line 7108  SCANTRONFORM
+ Line 7481  SCANTRONFORM
    	($uname,$udom)=split(/:/,$uname);
  	&Apache::lonxml::clear_problem_counter();
-   	&Apache::lonnet::appenv(%$scan_record);
+   	&Apache::lonnet::appenv($scan_record);
  	if (&scantron_clear_skip($scanlines,$scan_data,$i)) {
  	    &scantron_putfile($scanlines,$scan_data);
  	}
- 	my $i=0;
+         my $scancode;
- 	foreach my $resource (@resources) {
+         if ((exists($scan_record->{'scantron.CODE'})) &&
- 	    $i++;
+             (&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'}))) {
- 	    my %form=('submitted'     =>'scantron',
+             $scancode = $scan_record->{'scantron.CODE'};
- 		      'grade_target'  =>'grade',
+         } else {
- 		      'grade_username'=>$uname,
+             $scancode = '';
- 		      'grade_domain'  =>$udom,
+         }
- 		      'grade_courseid'=>$env{'request.course.id'},
- 		      'grade_symb'    =>$resource->symb());
+         if (&grade_student_bubbles($r,$uname,$udom,$scan_record,$scancode,
- 	    if (exists($scan_record->{'scantron.CODE'})
+                                    @resources) eq 'ssi_error') {
- 		&&
+             $ssi_error = 0; # So end of handler error message does not trigger.
- 		&Apache::lonnet::validCODE($scan_record->{'scantron.CODE'})) {
+             $r->print("</form>");
- 		$form{'CODE'}=$scan_record->{'scantron.CODE'};
+             &ssi_print_error($r);
- 	    } else {
+             $r->print(&show_grading_menu_form($symb));
- 		$form{'CODE'}='';
+             &Apache::lonnet::remove_lock($lock);
- 	    }
+             return '';      # Why return ''?  Beats me.
- 	    my $result=&Apache::lonnet::ssi($resource->src(),%form);
+         }
- 	    if ($result ne '') {
- 	    }
- 	    if (&Apache::loncommon::connection_aborted($r)) { last; }
- 	}
  	$completedstudents{$uname}={'line'=>$line};
- 	if (&Apache::loncommon::connection_aborted($r)) { last; }
+         if ($env{'form.verifyrecord'}) {
+             my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
+             my $studentdata = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
+             chomp($studentdata);
+             $studentdata =~ s/\r$//;
+             my $studentrecord = '';
+             my $counter = -1;
+             foreach my $resource (@resources) {
+                 ($counter,my $recording) =
+                     &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                              $counter,$studentdata,\%partids_by_symb,
+                                              \%scantron_config,\%lettdig,$numletts);
+                 $studentrecord .= $recording;
+             }
+             if ($studentrecord ne $studentdata) {
+                 $counter = -1;
+                 $studentrecord = '';
+                 foreach my $resource (@resources) {
+                     ($counter,my $recording) =
+                         &verify_scantron_grading($resource,$udom,$uname,$env{'request.course.id'},
+                                                  $counter,$studentdata,\%partids_by_symb,
+                                                  \%scantron_config,\%lettdig,$numletts);
+                     $studentrecord .= $recording;
+                 }
+                 if ($studentrecord ne $studentdata) {
+                     $r->print('<p><span class="LC_error">');
+                     if ($scancode eq '') {
+                         $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2].',
+                                   $uname.':'.$udom,$scan_record->{'scantron.ID'}));
+                     } else {
+                         $r->print(&mt('Mismatch grading bubble sheet for user: [_1] with ID: [_2] and CODE: [_3].',
+                                   $uname.':'.$udom,$scan_record->{'scantron.ID'},$scancode));
+                     }
+                     $r->print('</span><br />'.&Apache::loncommon::start_data_table()."\n".
+                               &Apache::loncommon::start_data_table_header_row()."\n".
+                               '<th>'.&mt('Source').'</th><th>'.&mt('Bubbled responses').'</th>'.
+                               &Apache::loncommon::end_data_table_header_row()."\n".
+                               &Apache::loncommon::start_data_table_row().
+                               '<td>'.&mt('Bubble Sheet').'</td>'.
+                               '<td><span class="LC_nobreak">'.$studentdata.'</span></td>'.
+                               &Apache::loncommon::end_data_table_row().
+                               &Apache::loncommon::start_data_table_row().
+                               '<td>Stored submissions</td>'.
+                               '<td><span class="LC_nobreak">'.$studentrecord.'</span></td>'."\n".
+                               &Apache::loncommon::end_data_table_row().
+                               &Apache::loncommon::end_data_table().'</p>');
+                 } else {
+                     $r->print('<br /><span class="LC_warning">'.
+                              &mt('A second grading pass was needed for user: [_1] with ID: [_2], because a mismatch was seen on the first pass.',$uname.':'.$udom,$scan_record->{'scantron.ID'}).'<br />'.
+                              &mt("As a consequence, this user's submission history records two tries.").
+                                  '</span><br />');
+                 }
+             }
+         }
+         if (&Apache::loncommon::connection_aborted($r)) { last; }
      } continue {
  	&Apache::lonxml::clear_problem_counter();
  	&Apache::lonnet::delenv('scantron\.');
      }
      &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+     &Apache::lonnet::remove_lock($lock);
  #    my $lasttime = &Time::HiRes::time()-$start;
  #    $r->print("<p>took $lasttime</p>");
- Line 7150  SCANTRONFORM
+ Line 7575  SCANTRONFORM
      return '';
  }
- =pod
+ sub grade_student_bubbles {
+     my ($r,$uname,$udom,$scan_record,$scancode,@resources) = @_;
- =item scantron_upload_scantron_data
+     foreach my $resource (@resources) {
+         my %form = ('submitted'     => 'scantron',
-     Creates the screen for adding a new bubble sheet data file to a course.
+                     'grade_target'  => 'grade',
+                     'grade_username'=> $uname,
- =cut
+                     'grade_domain'  => $udom,
+                     'grade_courseid'=> $env{'request.course.id'},
+                     'grade_symb'    => $resource->symb(),
+                     'CODE'          => $scancode);
+         my $result=&ssi_with_retries($resource->src(),$ssi_retries,%form);
+         return 'ssi_error' if ($ssi_error);
+         last if (&Apache::loncommon::connection_aborted($r));
+     }
+     return;
+ }
  sub scantron_upload_scantron_data {
      my ($r)=@_;
- Line 7167  sub scantron_upload_scantron_data {
+ Line 7601  sub scantron_upload_scantron_data {
      my $domsel=&Apache::loncommon::select_dom_form($env{'request.role.domain'},
  						   'domainid');
      my $default_form_data=&defaultFormData(&get_symb($r,1));
-     $r->print(<<UPLOAD);
+     $r->print('
  <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.");
+ 	    alert("'.&mt('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'>
+ <form enctype="multipart/form-data" action="/adm/grades" name="rules" method="post">
- $default_form_data
+ '.$default_form_data.'
  <table>
- <tr><td>$select_link </td></tr>
+ <tr><td>'.$select_link.'                             </td></tr>
- <tr><td>Course ID:   </td><td><input name='courseid' type='text' />  </td></tr>
+ <tr><td>'.&mt('Course ID:').'     </td>
- <tr><td>Course Name: </td><td><input name='coursename' type='text' /></td></tr>
+     <td><input name="courseid"   type="text" />      </td></tr>
- <tr><td>Domain:      </td><td>$domsel                                </td></tr>
+ <tr><td>'.&mt('Course Name:').'   </td>
- <tr><td>File to upload:</td><td><input type="file" name="upfile" size="50" /></td></tr>
+     <td><input name="coursename" type="text" />      </td></tr>
+ <tr><td>'.&mt('Domain:').'        </td>
+     <td>'.$domsel.'                                  </td></tr>
+ <tr><td>'.&mt('File to upload:').'</td>
+     <td><input type="file" name="upfile" size="50" /></td></tr>
  </table>
- <input name='command' value='scantronupload_save' type='hidden' />
+ <input name="command" value="scantronupload_save" type="hidden" />
- <input type="button" onClick="javascript:checkUpload(this.form);" value="Upload Scantron Data" />
+ <input type="button" onClick="javascript:checkUpload(this.form);" value="'.&mt('Upload Scantron Data').'" />
  </form>
- UPLOAD
+ ');
      return '';
  }
- =pod
- =item scantron_upload_scantron_data_save
-    Adds a provided bubble information data file to the course if user
-    has the correct privileges to do so.
- =cut
  sub scantron_upload_scantron_data_save {
      my($r)=@_;
- Line 7209  sub scantron_upload_scantron_data_save {
+ Line 7639  sub scantron_upload_scantron_data_save {
      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".
+ 	'<input type="submit" name="submit" value="'.&mt('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 />");
+ 	$r->print(&mt("You are not allowed to upload Scantron data to the requested course.")."<br />");
  	if ($symb) {
  	    $r->print(&show_grading_menu_form($symb));
  	} else {
- Line 7223  sub scantron_upload_scantron_data_save {
+ Line 7653  sub scantron_upload_scantron_data_save {
  	return '';
      }
      my %coursedata=&Apache::lonnet::coursedescription($env{'form.domainid'}.'_'.$env{'form.courseid'});
-     $r->print("Doing upload to ".$coursedata{'description'}." <br />");
+     $r->print(&mt("Doing upload to [_1]",$coursedata{'description'})." <br />");
      my $fname=$env{'form.upfile.filename'};
      #FIXME
      #copied from lonnet::userfileupload()
- Line 7241  sub scantron_upload_scantron_data_save {
+ Line 7671  sub scantron_upload_scantron_data_save {
      my $uploadedfile=$fname;
      $fname='scantron_orig_'.$fname;
      if (length($env{'form.upfile'}) < 2) {
- 	$r->print("<span class=\"LC_error\">Error:</span> 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.");
+ 	$r->print(&mt("<span class=\"LC_error\">Error:</span> The file you attempted to upload, [_1]  contained no information. Please check that you entered the correct filename.",'<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
      } else {
  	my $result=&Apache::lonnet::finishuserfileupload($env{'form.courseid'},$env{'form.domainid'},'upfile',$fname);
  	if ($result =~ m|^/uploaded/|) {
- 	    $r->print("<span class=\"LC_success\">Success:</span> Successfully uploaded ".(length($env{'form.upfile'})-1)." bytes of data into location <tt>".$result."</tt>");
+ 	    $r->print(&mt("<span class=\"LC_success\">Success:</span> Successfully uploaded [_1] bytes of data into location [_2]",
+ 			  (length($env{'form.upfile'})-1),
+ 			  '<span class="LC_filename">'.$result."</span>"));
  	} else {
- 	    $r->print("<span class=\"LC_error\">Error:</span> An error (".$result.") occurred when attempting to upload the file, <tt>".&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</tt>");
+ 	    $r->print(&mt("<span class=\"LC_error\">Error:</span> An error ([_1]) occurred when attempting to upload the file, [_2]",
+ 			  $result,
+ 			  '<span class="LC_filename">'.&HTML::Entities::encode($env{'form.upfile.filename'},'<>&"')."</span>"));
  	}
      }
      if ($symb) {
- Line 7258  sub scantron_upload_scantron_data_save {
+ Line 7693  sub scantron_upload_scantron_data_save {
      return '';
  }
- =pod
- =item valid_file
-    Validates that the requested bubble data file exists in the course.
- =cut
  sub valid_file {
      my ($requested_file)=@_;
      foreach my $filename (sort(&scantron_filenames())) {
- Line 7274  sub valid_file {
+ Line 7701  sub valid_file {
      return 0;
  }
- =pod
- =item scantron_download_scantron_data
-    Shows a list of the three internal files (original, corrected,
-    skipped) for a specific bubble sheet data file that exists in the
-    course.
- =cut
  sub scantron_download_scantron_data {
      my ($r)=@_;
      my $default_form_data=&defaultFormData(&get_symb($r,1));
- Line 7291  sub scantron_download_scantron_data {
+ Line 7708  sub scantron_download_scantron_data {
      my $cdom=$env{'course.'.$env{'request.course.id'}.'.domain'};
      my $file=$env{'form.scantron_selectfile'};
      if (! &valid_file($file)) {
- 	$r->print(<<ERROR);
+ 	$r->print('
  	<p>
- 	    The requested file name was invalid.
+ 	    '.&mt('The requested file name was invalid.').'
          </p>
- ERROR
+ ');
  	$r->print(&show_grading_menu_form(&get_symb($r,1)));
  	return;
      }
- Line 7305  ERROR
+ Line 7722  ERROR
      &Apache::lonnet::allowuploaded('/adm/grades',$orig);
      &Apache::lonnet::allowuploaded('/adm/grades',$corrected);
      &Apache::lonnet::allowuploaded('/adm/grades',$skipped);
-     $r->print(<<DOWNLOAD);
+     $r->print('
      <p>
- 	<a href="$orig">Original</a> file as uploaded by the scantron office.
+ 	'.&mt('[_1]Original[_2] file as uploaded by the scantron office.',
+ 	      '<a href="'.$orig.'">','</a>').'
      </p>
      <p>
- 	<a href="$corrected">Corrections</a>, a file of corrected records that were used in grading.
+ 	'.&mt('[_1]Corrections[_2], a file of corrected records that were used in grading.',
+ 	      '<a href="'.$corrected.'">','</a>').'
      </p>
      <p>
- 	<a href="$skipped">Skipped</a>, a file of records that were skipped.
+ 	'.&mt('[_1]Skipped[_2], a file of records that were skipped.',
+ 	      '<a href="'.$skipped.'">','</a>').'
      </p>
- DOWNLOAD
+ ');
      $r->print(&show_grading_menu_form(&get_symb($r,1)));
      return '';
  }
- =pod
+ sub checkscantron_results {
+     my ($r) = @_;
+     my ($symb)=&get_symb($r);
+     if (!$symb) {return '';}
+     my $grading_menu_button=&show_grading_menu_form($symb);
+     my $cid = $env{'request.course.id'};
+     my %lettdig = &letter_to_digits();
+     my $numletts = scalar(keys(%lettdig));
+     my $cnum = $env{'course.'.$cid.'.num'};
+     my $cdom = $env{'course.'.$cid.'.domain'};
+     my (undef, undef, $sequence) = &Apache::lonnet::decode_symb($env{'form.selectpage'});
+     my %record;
+     my %scantron_config =
+         &Apache::grades::get_scantron_config($env{'form.scantron_format'});
+     my ($scanlines,$scan_data)=&Apache::grades::scantron_getfile();
+     my $classlist=&Apache::loncoursedata::get_classlist();
+     my %idmap=&Apache::grades::username_to_idmap($classlist);
+     my $navmap=Apache::lonnavmaps::navmap->new();
+     my $map=$navmap->getResourceByUrl($sequence);
+     my @resources=$navmap->retrieveResources($map,undef,1,0);
+     my ($uname,$udom,%partids_by_symb);
+     foreach my $resource (@resources) {
+         my $ressymb = $resource->symb();
+         my ($analysis,$parts) =
+             &scantron_partids_tograde($resource,$env{'request.course.id'},$uname,$udom);
+         $partids_by_symb{$ressymb} = $parts;
+     }
+     my (%scandata,%lastname,%bylast);
+     $r->print('
+ <form method="post" enctype="multipart/form-data" action="/adm/grades" name="checkscantron">'."\n");
- =back
+     my @delayqueue;
+     my %completedstudents;
+     my $count=&Apache::grades::get_todo_count($scanlines,$scan_data);
+     my %prog_state=&Apache::lonhtmlcommon::Create_PrgWin($r,'Scantron/Submissions Comparison Status',
+                                     'Progress of Scantron Data/Submission Records Comparison',$count,
+                                     'inline',undef,'checkscantron');
+     my ($username,$domain,$started);
+     &Apache::grades::scantron_get_maxbubble();  # Need the bubble lines array to parse.
+     &Apache::lonhtmlcommon::Update_PrgWin($r,\%prog_state,
+                                           'Processing first student');
+     my $start=&Time::HiRes::time();
+     my $i=-1;
+     while ($i<$scanlines->{'count'}) {
+         ($username,$domain,$uname)=('','','');
+         $i++;
+         my $line=&Apache::grades::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=
+             &Apache::grades::scantron_parse_scanline($line,$i,\%scantron_config,
+                                                      $scan_data);
+         unless ($uname=&Apache::grades::scantron_find_student($scan_record,$scan_data,
+                                                               \%idmap,$i)) {
+             &Apache::grades::scantron_add_delay(\@delayqueue,$line,
+                                 'Unable to find a student that matches',1);
+             next;
+         }
+         if (exists $completedstudents{$uname}) {
+             &Apache::grades::scantron_add_delay(\@delayqueue,$line,
+                                 'Student '.$uname.' has multiple sheets',2);
+             next;
+         }
+         my $pid = $scan_record->{'scantron.ID'};
+         $lastname{$pid} = $scan_record->{'scantron.LastName'};
+         push(@{$bylast{$lastname{$pid}}},$pid);
+         my $lastpos = $env{'form.scantron_maxbubble'}*$scantron_config{'Qlength'};
+         $scandata{$pid} = substr($line,$scantron_config{'Qstart'}-1,$lastpos);
+         chomp($scandata{$pid});
+         $scandata{$pid} =~ s/\r$//;
+         ($username,$domain)=split(/:/,$uname);
+         my $counter = -1;
+         foreach my $resource (@resources) {
+             ($counter,my $recording) =
+                 &verify_scantron_grading($resource,$domain,$username,$cid,$counter,
+                                          $scandata{$pid},\%partids_by_symb,
+                                          \%scantron_config,\%lettdig,$numletts);
+             $record{$pid} .= $recording;
+         }
+     }
+     &Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state);
+     $r->print('<br />');
+     my ($okstudents,$badstudents,$numstudents,$passed,$failed);
+     $passed = 0;
+     $failed = 0;
+     $numstudents = 0;
+     foreach my $last (sort(keys(%bylast))) {
+         if (ref($bylast{$last}) eq 'ARRAY') {
+             foreach my $pid (sort(@{$bylast{$last}})) {
+                 my $showscandata = $scandata{$pid};
+                 my $showrecord = $record{$pid};
+                 $showscandata =~ s/\s/&nbsp;/g;
+                 $showrecord =~ s/\s/&nbsp;/g;
+                 if ($scandata{$pid} eq $record{$pid}) {
+                     my $css_class = ($passed % 2)?'LC_odd_row':'LC_even_row';
+                     $okstudents .= '<tr class="'.$css_class.'">'.
+ '<td>'.&mt('Scantron').'</td><td>'.$showscandata.'</td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
+ '</tr>'."\n".
+ '<tr class="'.$css_class.'">'."\n".
+ '<td>Submissions</td><td>'.$showrecord.'</td></tr>'."\n";
+                     $passed ++;
+                 } else {
+                     my $css_class = ($failed % 2)?'LC_odd_row':'LC_even_row';
+                     $badstudents .= '<tr class="'.$css_class.'"><td>'.&mt('Scantron').'</td><td><span class="LC_nobreak">'.$scandata{$pid}.'</span></td><td rowspan="2">'.$last.'</td><td rowspan="2">'.$pid.'</td>'."\n".
+ '</tr>'."\n".
+ '<tr class="'.$css_class.'">'."\n".
+ '<td>Submissions</td><td><span class="LC_nobreak">'.$record{$pid}.'</span></td>'."\n".
+ '</tr>'."\n";
+                     $failed ++;
+                 }
+                 $numstudents ++;
+             }
+         }
+     }
+     $r->print('<p>'.&mt('Comparison of scantron data (including corrections) with corresponding submission records (most recent submission) for <b>[quant,_1,student]</b>  ([_2] scantron lines/student).',$numstudents,$env{'form.scantron_maxbubble'}).'</p>');
+     $r->print('<p>'.&mt('Exact matches for <b>[quant,_1,student]</b>.',$passed).'<br />'.&mt('Discrepancies detected for <b>[quant,_1,student]</b>.',$failed).'</p>');
+     if ($passed) {
+         $r->print(&mt('Students with exact correspondence between scantron data and submissions are as follows:').'<br /><br />');
+         $r->print(&Apache::loncommon::start_data_table()."\n".
+                  &Apache::loncommon::start_data_table_header_row()."\n".
+                  '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row()."\n".
+                  $okstudents."\n".
+                  &Apache::loncommon::end_data_table().'<br />');
+     }
+     if ($failed) {
+         $r->print(&mt('Students with differences between scantron data and submissions are as follows:').'<br /><br />');
+         $r->print(&Apache::loncommon::start_data_table()."\n".
+                  &Apache::loncommon::start_data_table_header_row()."\n".
+                  '<th>'.&mt('Source').'</th><th>'.&mt('Bubble records').'</th><th>'.&mt('Name').'</th><th>'.&mt('ID').'</th>'.
+                  &Apache::loncommon::end_data_table_header_row()."\n".
+                  $badstudents."\n".
+                  &Apache::loncommon::end_data_table()).'<br />'.
+                  &mt('Differences can occur if submissions were modified using manual grading after a scantron grading pass.').'<br />'.&mt('If unexpected discrepancies were detected, it is recommended that you inspect the original scantron sheets.');
+     }
+     $r->print('</form><br />'.$grading_menu_button);
+     return;
+ }
+ sub verify_scantron_grading {
+     my ($resource,$domain,$username,$cid,$counter,$scandata,$partids_by_symb,
+         $scantron_config,$lettdig,$numletts) = @_;
+     my ($record,%expected,%startpos);
+     return ($counter,$record) if (!ref($resource));
+     return ($counter,$record) if (!$resource->is_problem());
+     my $symb = $resource->symb();
+     return ($counter,$record) if (ref($partids_by_symb) ne 'HASH');
+     return ($counter,$record) if (ref($partids_by_symb->{$symb}) ne 'ARRAY');
+     foreach my $part_id (@{$partids_by_symb->{$symb}}) {
+         $counter ++;
+         $expected{$part_id} = 0;
+         if ($env{"form.scantron.sub_bubblelines.$counter"}) {
+             my @sub_lines = split(/,/,$env{"form.scantron.sub_bubblelines.$counter"});
+             foreach my $item (@sub_lines) {
+                 $expected{$part_id} += $item;
+             }
+         } else {
+             $expected{$part_id} = $env{"form.scantron.bubblelines.$counter"};
+         }
+         $startpos{$part_id} = $env{"form.scantron.first_bubble_line.$counter"};
+     }
+     if ($symb) {
+         my %recorded;
+         my (%returnhash) = &Apache::lonnet::restore($symb,$cid,$domain,$username);
+         if ($returnhash{'version'}) {
+             my %lasthash=();
+             my $version;
+             for ($version=1;$version<=$returnhash{'version'};$version++) {
+                 foreach my $key (sort(split(/\:/,$returnhash{$version.':keys'}))) {
+                     $lasthash{$key}=$returnhash{$version.':'.$key};
+                 }
+             }
+             foreach my $key (keys(%lasthash)) {
+                 if ($key =~ /\.scantron$/) {
+                     my $value = &unescape($lasthash{$key});
+                     my ($part_id) = ($key =~ /^resource\.(.+)\.scantron$/);
+                     if ($value eq '') {
+                         for (my $i=0; $i<$expected{$part_id}; $i++) {
+                             for (my $j=0; $j<$scantron_config->{'length'}; $j++) {
+                                 $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                             }
+                         }
+                     } else {
+                         my @tocheck;
+                         my @items = split(//,$value);
+                         if (($scantron_config->{'Qon'} eq 'letter') ||
+                             ($scantron_config->{'Qon'} eq 'number')) {
+                             if (@items < $expected{$part_id}) {
+                                 my $fragment = substr($scandata,$startpos{$part_id},$expected{$part_id});
+                                 my @singles = split(//,$fragment);
+                                 foreach my $pos (@singles) {
+                                     if ($pos eq ' ') {
+                                         push(@tocheck,$pos);
+                                     } else {
+                                         my $next = shift(@items);
+                                         push(@tocheck,$next);
+                                     }
+                                 }
+                             } else {
+                                 @tocheck = @items;
+                             }
+                             foreach my $letter (@tocheck) {
+                                 if ($scantron_config->{'Qon'} eq 'letter') {
+                                     if ($letter !~ /^[A-J]$/) {
+                                         $letter = $scantron_config->{'Qoff'};
+                                     }
+                                     $recorded{$part_id} .= $letter;
+                                 } elsif ($scantron_config->{'Qon'} eq 'number') {
+                                     my $digit;
+                                     if ($letter !~ /^[A-J]$/) {
+                                         $digit = $scantron_config->{'Qoff'};
+                                     } else {
+                                         $digit = $lettdig->{$letter};
+                                     }
+                                     $recorded{$part_id} .= $digit;
+                                 }
+                             }
+                         } else {
+                             @tocheck = @items;
+                             for (my $i=0; $i<$expected{$part_id}; $i++) {
+                                 my $curr_sub = shift(@tocheck);
+                                 my $digit;
+                                 if ($curr_sub =~ /^[A-J]$/) {
+                                     $digit = $lettdig->{$curr_sub}-1;
+                                 }
+                                 if ($curr_sub eq 'J') {
+                                     $digit += scalar($numletts);
+                                 }
+                                 for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) {
+                                     if ($j == $digit) {
+                                         $recorded{$part_id} .= $scantron_config->{'Qon'};
+                                     } else {
+                                         $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                                     }
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+         }
+         foreach my $part_id (@{$partids_by_symb->{$symb}}) {
+             if ($recorded{$part_id} eq '') {
+                 for (my $i=0; $i<$expected{$part_id}; $i++) {
+                     for (my $j=0; $j<$scantron_config->{'Qlength'}; $j++) {
+                         $recorded{$part_id} .= $scantron_config->{'Qoff'};
+                     }
+                 }
+             }
+             $record .= $recorded{$part_id};
+         }
+     }
+     return ($counter,$record);
+ }
+ sub letter_to_digits {
+     my %lettdig = (
+                     A => 1,
+                     B => 2,
+                     C => 3,
+                     D => 4,
+                     E => 5,
+                     F => 6,
+                     G => 7,
+                     H => 8,
+                     I => 9,
+                     J => 0,
+                   );
+     return %lettdig;
+ }
- =cut
  #-------- end of section for handling grading scantron forms -------
  #
- Line 7371  sub grading_menu {
+ Line 8065  sub grading_menu {
                    'saveState'=>"",
                    'gradingMenu'=>1,
                    'showgrading'=>"yes");
-     my $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     my @menu = ({ url => $url,
+     my $url1 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-                      name => &mt('Manual Grading/View Submissions'),
-                      short_description =>
-     &mt('Start the process of hand grading submissions.'),
-                  });
      $fields{'command'} = 'csvform';
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     my $url2 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     push (@menu, { url => $url,
-                    name => &mt('Upload Scores'),
-                    short_description =>
-             &mt('Specify a file containing the class scores for current resource.')});
      $fields{'command'} = 'processclicker';
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     my $url3 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     push (@menu, { url => $url,
-                    name => &mt('Process Clicker'),
-                    short_description =>
-             &mt('Specify a file containing the clicker information for this resource.')});
      $fields{'command'} = 'scantron_selectphase';
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+     my $url4 = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
-     push (@menu, { url => $url,
-                    name => &mt('Grade/Manage Scantron Forms'),
+     my @menu = ({	categorytitle=>'Course Grading',
-                    short_description =>
+             items =>[
-             &mt('')});
+                         {	linktext => 'Manual Grading/View Submissions',
-     $fields{'command'} = 'verify';
+                     		url => $url1,
-     $url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
+                     		permission => 'F',
-     push (@menu, { url => "",
+                     		icon => 'edit-find-replace.png',
-                    name => &mt('Verify Receipt'),
+                     		linktitle => 'Start the process of hand grading submissions.'
-                    short_description =>
+                         },
-             &mt('')});
+                 	    {	linktext => 'Upload Scores',
+                     		url => $url2,
+                     		permission => 'F',
+                     		icon => 'uploadscores.png',
+                     		linktitle => 'Specify a file containing the class scores for current resource.'
+                 	    },
+                 	    {	linktext => 'Process Clicker',
+                     		url => $url3,
+                     		permission => 'F',
+                     		icon => 'addClickerInfoFile.png',
+                     		linktitle => 'Specify a file containing the clicker information for this resource.'
+                 	    },
+                 	    {	linktext => 'Grade/Manage/Review Scantron Forms',
+                     		url => $url4,
+                     		permission => 'F',
+                     		icon => 'stat.png',
+                     		linktitle => 'Grade scantron exams, upload/download scantron data files, and review previously graded scantron exams.'
+                 	    }
+                     ]
+             });
+     #$fields{'command'} = 'verify';
+     #$url = &Apache::lonhtmlcommon::build_url('grades/',\%fields);
      #
      # Create the menu
      my $Str;
- Line 7414  sub grading_menu {
+ Line 8121  sub grading_menu {
  	'<input type="hidden" name="gradingMenu" value="1" />'."\n".
  	'<input type="hidden" name="showgrading" value="yes" />'."\n";
-     foreach my $menudata (@menu) {
+     $Str .= Apache::lonhtmlcommon::generate_menu(@menu);
-         if ($menudata->{'name'} ne &mt('Verify Receipt')) {
+     #$menudata->{'jscript'}
-             $Str .='    <h3><a '.
+     $Str .='<hr /><input type="button" value="'.&mt('Verify Receipt').'" '.
-                 $menudata->{'jscript'}.
+         ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-                 ' href="'.
+         ' /> '.
-                 $menudata->{'url'}.'" >'.
+         &Apache::lonnet::recprefix($env{'request.course.id'}).
-                 $menudata->{'name'}."</a></h3>\n";
+         '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />';
-         } else {
-             $Str .='    <h3><input type="button" value="'.&mt('Verify Receipt').'" '.
-                 $menudata->{'jscript'}.
-                 ' onClick="javascript:checkChoice(document.forms.gradingMenu,\'5\',\'verify\')" '.
-                 ' /></h3>';
-             $Str .= ('&nbsp;'x8).
- 		&mt(' receipt: [_1]',
- 		    &Apache::lonnet::recprefix($env{'request.course.id'}).
-                     '-<input type="text" name="receipt" size="4" onChange="javascript:checkReceiptNo(this.form,\'OK\')" />');
-         }
-         $Str .= '    '.('&nbsp;'x8).$menudata->{'short_description'}.
-             "\n";
-     }
      $Str .="</form>\n";
+     my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
      $request->print(<<GRADINGMENUJS);
  <script type="text/javascript" language="javascript">
      function checkChoice(formname,val,cmdx) {
- Line 7462  sub grading_menu {
+ Line 8158  sub grading_menu {
  	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
  	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
  	if (checkOpt) {
- 	    alert("Please enter a receipt number given by a student in the receipt box.");
+ 	    alert("$receiptalert");
  	    formname.receipt.value = "";
  	    formname.receipt.focus();
  	    return false;
- Line 7483  sub submit_options {
+ Line 8179  sub submit_options {
      if (!$symb) {return '';}
      my $probTitle = &Apache::lonnet::gettitle($symb);
+     my $receiptalert = &mt("Please enter a receipt number given by a student in the receipt box.");
      $request->print(<<GRADINGMENUJS);
  <script type="text/javascript" language="javascript">
      function checkChoice(formname,val,cmdx) {
- Line 7510  sub submit_options {
+ Line 8207  sub submit_options {
  	if (nospace == "OK" && isNaN(receiptNo)) {checkOpt = true;}
  	if (nospace == "notOK" && (isNaN(receiptNo) || receiptNo == "")) {checkOpt = true;}
  	if (checkOpt) {
- 	    alert("Please enter a receipt number given by a student in the receipt box.");
+ 	    alert("$receiptalert");
  	    formname.receipt.value = "";
  	    formname.receipt.focus();
  	    return false;
- Line 7529  GRADINGMENUJS
+ Line 8226  GRADINGMENUJS
      my $saveSub = ($$savedState{'saveSub'} eq '' ? 'all' : $$savedState{'saveSub'});
      my $saveStatus = ($$savedState{'saveStatus'} eq '' ? 'Active' : $$savedState{'saveStatus'});
+     # Preselect sections
+     my $selsec="";
+     if (ref($sections)) {
+         foreach my $section (sort(@$sections)) {
+             $selsec.='<option value="'.$section.'" '.
+                 ($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
+         }
+     }
      $result.='<form action="/adm/grades" method="post" name="gradingMenu">'."\n".
  	'<input type="hidden" name="symb"        value="'.&Apache::lonenc::check_encrypt($symb).'" />'."\n".
  	'<input type="hidden" name="handgrade"   value="'.$hdgrade.'" />'."\n".
- Line 7539  GRADINGMENUJS
+ Line 8245  GRADINGMENUJS
  	'<input type="hidden" name="showgrading" value="yes" />'."\n";
      $result.='
-     <div class="LC_grade_select_mode">
+ <h2>
-       <div class="LC_grade_select_mode_current">
+   '.&mt('Grade Current Resource').'
-         <h2>
+ </h2>
-           '.&mt('Grade Current Resource').'
+ <div>
-         </h2>
+   '.$table.'
-         <div class="LC_grade_select_mode_body">
+ </div>
-           <div class="LC_grades_resource_info">
-            '.$table.'
+ <div class="LC_columnSection">
-           </div>
-           <div class="LC_grade_select_mode_selector">
+     <fieldset>
-              <div class="LC_grade_select_mode_selector_header">
+       <legend>
-                 '.&mt('Sections').'
+        '.&mt('Sections').'
-              </div>
+       </legend>
-              <div class="LC_grade_select_mode_selector_body">
+       <select name="section" multiple="multiple" size="5">'."\n";
- 	       <select name="section" multiple="multiple" size="5">'."\n";
+     $result.= $selsec;
-     if (ref($sections)) {
- 	foreach my $section (sort (@$sections)) {
- 	    $result.='<option value="'.$section.'" '.
- 		($saveSec eq $section ? 'selected="selected"':'').'>'.$section.'</option>'."\n";
- 	}
-     }
      $result.= '<option value="all" '.($saveSec eq 'all' ? 'selected="selected"' : ''). '>all</option></select> &nbsp; ';
      $result.='
-              </div>
+     </fieldset>
-           </div>
-           <div class="LC_grade_select_mode_selector">
+     <fieldset>
-              <div class="LC_grade_select_mode_selector_header">
+       <legend>
-                 '.&mt('Groups').'
+         '.&mt('Groups').'
-              </div>
+       </legend>
-              <div class="LC_grade_select_mode_selector_body">
+       '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
-                 '.&Apache::lonstatistics::GroupSelect('group','multiple',5).'
+     </fieldset>
-              </div>
-           </div>
+     <fieldset>
-           <div class="LC_grade_select_mode_selector">
+       <legend>
-              <div class="LC_grade_select_mode_selector_header">
+         '.&mt('Access Status').'
-                 '.&mt('Access Status').'
+       </legend>
-              </div>
+       '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-              <div class="LC_grade_select_mode_selector_body">
+     </fieldset>
-                 '.&Apache::lonhtmlcommon::StatusOptions($saveStatus,undef,5,undef,'mult').'
-              </div>
+     <fieldset>
-           </div>
+       <legend>
-           <div class="LC_grade_select_mode_selector">
+         '.&mt('Submission Status').'
-              <div class="LC_grade_select_mode_selector_header">
+       </legend>
-                 '.&mt('Submission Status').'
+       <select name="submitonly" size="5">
-              </div>
-              <div class="LC_grade_select_mode_selector_body">
-                <select name="submitonly" size="5">
  	         <option value="yes" '.      ($saveSub eq 'yes'       ? 'selected="selected"' : '').'>'.&mt('with submissions').'</option>
  	         <option value="queued" '.   ($saveSub eq 'queued'    ? 'selected="selected"' : '').'>'.&mt('in grading queue').'</option>
  	         <option value="graded" '.   ($saveSub eq 'graded'    ? 'selected="selected"' : '').'>'.&mt('with ungraded submissions').'</option>
  	         <option value="incorrect" '.($saveSub eq 'incorrect' ? 'selected="selected"' : '').'>'.&mt('with incorrect submissions').'</option>
                   <option value="all" '.      ($saveSub eq 'all'       ? 'selected="selected"' : '').'>'.&mt('with any status').'</option>
-                </select>
+       </select>
-              </div>
+     </fieldset>
-           </div>
-           <div class="LC_grade_select_mode_type_body">
+ </div>
-             <div class="LC_grade_select_mode_type">
+ <br />
+           <div>
+             <div>
                <label>
                  <input type="radio" name="radioChoice" value="submission" '.
                    ($saveCmd eq 'submission' ? 'checked="checked"' : '').' /> '.
               &mt('Select individual students to grade and view submissions.').'
  	      </label>
              </div>
-             <div class="LC_grade_select_mode_type">
+             <div>
  	      <label>
                  <input type="radio" name="radioChoice" value="viewgrades" '.
                    ($saveCmd eq 'viewgrades' ? 'checked="checked"' : '').' /> '.
                      &mt('Grade all selected students in a grading table.').'
                </label>
              </div>
-             <div class="LC_grade_select_mode_type">
+             <div>
- 	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+ 	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
              </div>
            </div>
-         </div>
-       </div>
-       <div class="LC_grade_select_mode_page">
          <h2>
           '.&mt('Grade Complete Folder for One Student').'
          </h2>
-         <div class="LC_grades_select_mode_body">
+         <div>
-           <div class="LC_grade_select_mode_type_body">
+             <div>
-             <div class="LC_grade_select_mode_type">
                <label>
                  <input type="radio" name="radioChoice" value="pickStudentPage" '.
  	  ($saveCmd eq 'pickStudentPage' ? 'checked="checked"' : '').' /> '.
    &mt('The <b>complete</b> page/sequence/folder: For one student').'
                </label>
              </div>
-             <div class="LC_grade_select_mode_type">
+             <div>
- 	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next-&gt;').'" />
+ 	      <input type="button" onClick="javascript:checkChoice(this.form,\'2\');" value="'.&mt('Next').' &rarr;" />
              </div>
-           </div>
          </div>
-       </div>
-     </div>
    </form>';
+     $result .= &show_grading_menu_form($symb);
      return $result;
  }
- Line 7732  sub process_clicker {
+ Line 8428  sub process_clicker {
      $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";
-     $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource').
+     $result.='&nbsp;<b>'.&mt('Specify a file containing the clicker information for this resource.').
-         '.</b></td></tr>'."\n";
+         '</b></td></tr>'."\n";
      $result.='<tr bgcolor=#ffffe6><td>'."\n";
  # Attempt to restore parameters from last session, set defaults if not present
      my %Saveable_Parameters=&clicker_grading_parameters();
- Line 7745  sub process_clicker {
+ Line 8441  sub process_clicker {
      if (!$env{'form.upfiletype'}) { $env{'form.upfiletype'}='iclicker'; }
      my %checked;
-     foreach my $gradingmechanism ('attendance','personnel','specific') {
+     foreach my $gradingmechanism ('attendance','personnel','specific','given') {
         if ($env{'form.gradingmechanism'} eq $gradingmechanism) {
            $checked{$gradingmechanism}="checked='checked'";
         }
- Line 7756  sub process_clicker {
+ Line 8452  sub process_clicker {
      my $attendance=&mt("Award points just for participation");
      my $personnel=&mt("Correctness determined from response by course personnel");
      my $specific=&mt("Correctness determined from response with clicker ID(s)");
+     my $given=&mt("Correctness determined from given list of answers").' '.
+               '<font size="-2"><tt>('.&mt("Provide comma-separated list. Use '*' for any answer correct, '-' for skip").')</tt></font>';
      my $pcorrect=&mt("Percentage points for correct solution");
      my $pincorrect=&mt("Percentage points for incorrect solution");
      my $selectform=&Apache::loncommon::select_form($env{'form.upfiletype'},'upfiletype',
- Line 7813  function sanitycheck() {
+ Line 8511  function sanitycheck() {
  <br /><label><input type="radio" name="gradingmechanism" value="personnel" $checked{'personnel'} onClick="sanitycheck()" />$personnel</label>
  <br /><label><input type="radio" name="gradingmechanism" value="specific" $checked{'specific'} onClick="sanitycheck()" />$specific </label>
  <input type="text" name="specificid" value="$env{'form.specificid'}" size="20" />
+ <br /><label><input type="radio" name="gradingmechanism" value="given" $checked{'given'} onClick="sanitycheck()" />$given </label>
+ <br />&nbsp;&nbsp;&nbsp;
+ <input type="text" name="givenanswer" size="50" />
  <input type="hidden" name="waschecked" value="$env{'form.gradingmechanism'}" />
  <br /><label>$pcorrect: <input type="text" name="pcorrect" size="4" value="$env{'form.pcorrect'}" onChange="sanitycheck()" /></label>
  <br /><label>$pincorrect: <input type="text" name="pincorrect" size="4" value="$env{'form.pincorrect'}" onChange="sanitycheck()" /></label>
- Line 7839  sub process_clicker_file {
+ Line 8540  sub process_clicker_file {
  	$result.='<span class="LC_error">'.&mt('You need to specify a clicker ID for the correct answer').'</span>';
  	return $result.&show_grading_menu_form($symb);
      }
+     if (($env{'form.gradingmechanism'} eq 'given') && ($env{'form.givenanswer'}!~/\S/)) {
+         $result.='<span class="LC_error">'.&mt('You need to specify the correct answer').'</span>';
+         return $result.&show_grading_menu_form($symb);
+     }
+     my $foundgiven=0;
+     if ($env{'form.gradingmechanism'} eq 'given') {
+         $env{'form.givenanswer'}=~s/^\s*//gs;
+         $env{'form.givenanswer'}=~s/\s*$//gs;
+         $env{'form.givenanswer'}=~s/[^a-zA-Z0-9\.\*\-]+/\,/g;
+         $env{'form.givenanswer'}=uc($env{'form.givenanswer'});
+         my @answers=split(/\,/,$env{'form.givenanswer'});
+         $foundgiven=$#answers+1;
+     }
      my %clicker_ids=&gather_clicker_ids();
      my %correct_ids;
      if ($env{'form.gradingmechanism'} eq 'personnel') {
- Line 7857  sub process_clicker_file {
+ Line 8571  sub process_clicker_file {
      }
      if ($env{'form.gradingmechanism'} eq 'attendance') {
  	$result.=&mt('Score based on attendance only');
+     } elsif ($env{'form.gradingmechanism'} eq 'given') {
+         $result.=&mt('Score based on [_1] ([_2] answers)','<tt>'.$env{'form.givenanswer'}.'</tt>',$foundgiven);
      } else {
  	my $number=0;
  	$result.='<p><b>'.&mt('Correctness determined by the following IDs').'</b>';
- Line 7902  sub process_clicker_file {
+ Line 8618  sub process_clicker_file {
  <input type="hidden" name="pcorrect" value="$env{'form.pcorrect'}" />
  <input type="hidden" name="pincorrect" value="$env{'form.pincorrect'}" />
  ENDHEADER
+     if ($env{'form.gradingmechanism'} eq 'given') {
+        $result.='<input type="hidden" name="correct:given" value="'.$env{'form.givenanswer'}.'" />';
+     }
      my %responses;
      my @questiontitles;
      my $errormsg='';
- Line 7914  ENDHEADER
+ Line 8633  ENDHEADER
      }
      $result.='<br />'.&mt('Found [_1] question(s)',$number).'<br />'.
               '<input type="hidden" name="number" value="'.$number.'" />'.
-              &mt('Awarding [_1] percent for corrion(s)',$number).'<br />'.
-              '<input type="hidden" name="number" value="'.$number.'" />'.
               &mt('Awarding [_1] percent for correct and [_2] percent for incorrect responses',
                   $env{'form.pcorrect'},$env{'form.pincorrect'}).
               '<br />';
+     if (($env{'form.gradingmechanism'} eq 'given') && ($number!=$foundgiven)) {
+        $result.='<span class="LC_error">'.&mt('Number of given answers does not agree with number of questions in file.').'</span>';
+        return $result.&show_grading_menu_form($symb);
+     }
  # Remember Question Titles
  # FIXME: Possibly need delimiter other than ":"
      for (my $i=0;$i<$number;$i++) {
- Line 7962  ENDHEADER
+ Line 8683  ENDHEADER
      }
      $result.='<hr />'.
               &mt('Found [_1] registered and [_2] unregistered clickers.',$student_count,$unknown_count);
-     if ($env{'form.gradingmechanism'} ne 'attendance') {
+     if (($env{'form.gradingmechanism'} ne 'attendance') && ($env{'form.gradingmechanism'} ne 'given')) {
         if ($correct_count==0) {
            $errormsg.="Found no correct answers answers for grading!";
         } elsif ($correct_count>1) {
- Line 8033  sub interwrite_eval {
+ Line 8754  sub interwrite_eval {
          $id=~s/[\-\:]//g;
          $idresponses{$id}[$number]=$entries[6];
      }
-     foreach my $id (keys %idresponses) {
+     foreach my $id (keys(%idresponses)) {
         $$responses{$id}=join(',',@{$idresponses{$id}});
         $$responses{$id}=~s/^\s*\,//;
      }
- Line 8107  ENDHEADER
+ Line 8828  ENDHEADER
         if ($user) {
            my @answer=split(/\,/,$env{$key});
            my $sum=0;
+           my $realnumber=$number;
            for (my $i=0;$i<$number;$i++) {
               if ($answer[$i]) {
                  if ($gradingmechanism eq 'attendance') {
                     $sum+=$pcorrect;
+                 } elsif ($answer[$i] eq '*') {
+                    $sum+=$pcorrect;
+                 } elsif ($answer[$i] eq '-') {
+                    $realnumber--;
                  } else {
                     if ($answer[$i] eq $correct[$i]) {
                        $sum+=$pcorrect;
- Line 8120  ENDHEADER
+ Line 8846  ENDHEADER
                  }
               }
            }
-           my $ave=$sum/(100*$number);
+           my $ave=$sum/(100*$realnumber);
  # Store
            my ($username,$domain)=split(/\:/,$user);
            my %grades=();
- Line 8163  sub handler {
+ Line 8889  sub handler {
  	&Apache::lonnet::logthis("grades got multiple commands ".join(':',@commands));
      }
+     $ssi_error = 0;
-     $request->print(&Apache::loncommon::start_page('Grading'));
+     my $brcrum = [{href=>"/adm/grades",text=>"Grading"}];
+     $request->print(&Apache::loncommon::start_page('Grading',undef,
+                                           {'bread_crumbs' => $brcrum}));
      if ($symb eq '' && $command eq '') {
  	if ($env{'user.adv'}) {
  	    if (($env{'form.codeone'}) && ($env{'form.codetwo'}) &&
- Line 8176  sub handler {
+ Line 8904  sub handler {
  		if ($tsymb) {
  		    my ($map,$id,$url)=&Apache::lonnet::decode_symb($tsymb);
  		    if (&Apache::lonnet::allowed('mgr',$tcrsid)) {
- 			$request->print(&Apache::lonnet::ssi_body('/res/'.$url,
+ 			$request->print(&ssi_with_retries('/res/'.$url, $ssi_retries,
  					  ('grade_username' => $tuname,
  					   'grade_domain' => $tudom,
  					   'grade_courseid' => $tcrsid,
- Line 8259  sub handler {
+ Line 8987  sub handler {
   	} elsif ($command eq 'scantron_download' &&
  		 &Apache::lonnet::allowed('usc',$env{'request.course.id'})) {
   	    $request->print(&scantron_download_scantron_data($request));
+         } elsif ($command eq 'checksubmissions' && $perm{'vgr'}) {
+             $request->print(&checkscantron_results($request));
  	} elsif ($command) {
  	    $request->print("Access Denied ($command)");
  	}
      }
+     if ($ssi_error) {
+ 	&ssi_print_error($request);
+     }
      $request->print(&Apache::loncommon::end_page());
      &reset_caches();
      return '';
- Line 8271  sub handler {
+ Line 9004  sub handler {
 ;
  __END__;
+ =head1 NAME
+ Apache::grades
+ =head1 SYNOPSIS
+ Handles the viewing of grades.
+ This is part of the LearningOnline Network with CAPA project
+ described at http://www.lon-capa.org.
+ =head1 OVERVIEW
+ Do an ssi with retries:
+ While I'd love to factor out this with the vesrion in lonprintout,
+ that would either require a data coupling between modules, which I refuse to perpetuate (there's quite enough of that already), or would require the invention of another infrastructure
+ I'm not quite ready to invent (e.g. an ssi_with_retry object).
+ At least the logic that drives this has been pulled out into loncommon.
+ ssi_with_retries - Does the server side include of a resource.
+                      if the ssi call returns an error we'll retry it up to
+                      the number of times requested by the caller.
+                      If we still have a proble, no text is appended to the
+                      output and we set some global variables.
+                      to indicate to the caller an SSI error occurred.
+                      All of this is supposed to deal with the issues described
+                      in LonCAPA BZ 5631 see:
+                      http://bugs.lon-capa.org/show_bug.cgi?id=5631
+                      by informing the user that this happened.
+ Parameters:
+   resource   - The resource to include.  This is passed directly, without
+                interpretation to lonnet::ssi.
+   form       - The form hash parameters that guide the interpretation of the resource
+   retries    - Number of retries allowed before giving up completely.
+ Returns:
+   On success, returns the rendered resource identified by the resource parameter.
+ Side Effects:
+   The following global variables can be set:
+    ssi_error                - If an unrecoverable error occurred this becomes true.
+                               It is up to the caller to initialize this to false
+                               if desired.
+    ssi_error_resource  - If an unrecoverable error occurred, this is the value
+                               of the resource that could not be rendered by the ssi
+                               call.
+    ssi_error_message   - The error string fetched from the ssi response
+                               in the event of an error.
+ =head1 HANDLER SUBROUTINE
+ ssi_with_retries()
+ =head1 SUBROUTINES
+ =over
+ =item scantron_get_correction() :
+    Builds the interface screen to interact with the operator to fix a
+    specific error condition in a specific scanline
+  Arguments:
+     $r           - Apache request object
+     $i           - number of the current scanline
+     $scan_record - hash ref as returned from &scantron_parse_scanline()
+     $scan_config - hash ref as returned from &get_scantron_config()
+     $line        - full contents of the current scanline
+     $error       - error condition, valid values are
+                    'incorrectCODE', 'duplicateCODE',
+                    'doublebubble', 'missingbubble',
+                    'duplicateID', 'incorrectID'
+     $arg         - extra information needed
+        For errors:
+          - duplicateID   - paper number that this studentID was seen before on
+          - duplicateCODE - array ref of the paper numbers this CODE was
+                            seen on before
+          - incorrectCODE - current incorrect CODE
+          - doublebubble  - array ref of the bubble lines that have double
+                            bubble errors
+          - missingbubble - array ref of the bubble lines that have missing
+                            bubble errors
+ =item  scantron_get_maxbubble() :
+    Returns the maximum number of bubble lines that are expected to
+    occur. Does this by walking the selected sequence rendering the
+    resource and then checking &Apache::lonxml::get_problem_counter()
+    for what the current value of the problem counter is.
+    Caches the results to $env{'form.scantron_maxbubble'},
+    $env{'form.scantron.bubble_lines.n'},
+    $env{'form.scantron.first_bubble_line.n'} and
+    $env{"form.scantron.sub_bubblelines.n"}
+    which are the total number of bubble, lines, the number of bubble
+    lines for response n and number of the first bubble line for response n,
+    and a comma separated list of numbers of bubble lines for sub-questions
+    (for optionresponse, matchresponse, and rankresponse items), for response n.
+ =item  scantron_validate_missingbubbles() :
+    Validates all scanlines in the selected file to not have any
+     answers that don't have bubbles that have not been verified
+     to be bubble free.
+ =item  scantron_process_students() :
+    Routine that does the actual grading of the bubble sheet information.
+    The parsed scanline hash is added to %env
+    Then foreach unskipped scanline it does an &Apache::lonnet::ssi()
+    foreach resource , with the form data of
+ 	'submitted'     =>'scantron'
+ 	'grade_target'  =>'grade',
+ 	'grade_username'=> username of student
+ 	'grade_domain'  => domain of student
+ 	'grade_courseid'=> of course
+ 	'grade_symb'    => symb of resource to grade
+     This triggers a grading pass. The problem grading code takes care
+     of converting the bubbled letter information (now in %env) into a
+     valid submission.
+ =item  scantron_upload_scantron_data() :
+     Creates the screen for adding a new bubble sheet data file to a course.
+ =item  scantron_upload_scantron_data_save() :
+    Adds a provided bubble information data file to the course if user
+    has the correct privileges to do so.
+ =item  valid_file() :
+    Validates that the requested bubble data file exists in the course.
+ =item  scantron_download_scantron_data() :
+    Shows a list of the three internal files (original, corrected,
+    skipped) for a specific bubble sheet data file that exists in the
+    course.
+ =item  scantron_validate_ID() :
+    Validates all scanlines in the selected file to not have any
+    invalid or underspecified student IDs
+ =back
+ =cut

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.491
changed lines
	Added in v.1.548