--- loncom/homework/grades.pm	2008/02/04 17:45:07	1.506
+++ loncom/homework/grades.pm	2008/02/06 00:39:11	1.509
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.506 2008/02/04 17:45:07 raeburn Exp $
+# $Id: grades.pm,v 1.509 2008/02/06 00:39:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -3960,31 +3960,31 @@ sub csvuploadassign {
 		$grades{$store_key}=$entries{$fields{$dest}};
 	    }
 	}
-	if (! %grades) { push(@skipped,"$username:$domain no data to save"); }
-	$grades{"resource.regrader"}="$env{'user.name'}:$env{'user.domain'}";
-	my $result=&Apache::lonnet::cstore(\%grades,$symb,
+	if (! %grades) { 
+           push(@skipped,&mt("[_1]: no data to save","$username:$domain")); 
+        } 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') {
-	    $request->print('.');
-	} else {
-	    $request->print("<p>
-                              <span class=\"LC_error\">
-                                 Failed to save student $username:$domain.
-                                 Message when trying to save was ($result)
-                              </span>
-                             </p>" );
-	}
-	$request->rflush();
-	$countdone++;
+	   if ($result eq 'ok') {
+	      $request->print('.');
+	   } else {
+	      $request->print("<p><span class=\"LC_error\">".
+                              &mt("Failed to save data for student [_1]. Message when trying to save was: [_2]",
+                                  "$username:$domain",$result)."</span></p>");
+	   }
+	   $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");
@@ -4681,9 +4681,10 @@ my %bubble_lines_per_response;     # no.
 
 my %first_bubble_line;             # First bubble line no. for each bubble.
 
-my %subdivided_bubble_lines;       # no. bubble lines for optionresponse 
-                                   # or matchresponse where an individual 
-                                   # response can have multiple lines
+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
 
@@ -5524,6 +5525,10 @@ sub scantron_validator_positional {
     # If the split only gives us one element.. the full length of the
     # answer string, no bubbles are filled in:
 
+    if ($answers_needed eq '') {
+        return;
+    }
+
     if (length($array[0]) eq $$scantron_config{'Qlength'}*$answers_needed) {
         for (my $ans=0; $ans<$answers_needed; $ans++ ) {
             $record->{"scantron.$ansnum.answer"}='';
@@ -6788,8 +6793,8 @@ for multi and missing bubble cases).
                                   Numbered from 0 (but question numbers are from
                                   1.
    %first_bubble_line           - Starting bubble line for each question.
-   %subdivided_bubble_lines     - optionresponse and matchresponse type
-                                  problems render as separate sub-questions, 
+   %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.
@@ -7109,7 +7114,7 @@ sub scantron_validate_doublebubble {
    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 items only), for response n.  
+   (for optionresponse, matchresponse, and rankresponse items), for response n.  
 
 =cut
 
@@ -7182,10 +7187,11 @@ sub scantron_get_maxbubble {
 
 	    # TODO - make this a persistent hash not an array.
 
-            # optionresponse and matchresponse type items render as
-            # separate sub-questions in exam mode.
+            # optionresponse, matchresponse and rankresponse type items 
+            # render as separate sub-questions in exam mode.
             if (($analysis{$part_id.'.type'} eq 'optionresponse') ||
-                ($analysis{$part_id.'.type'} eq 'matchresponse')) {
+                ($analysis{$part_id.'.type'} eq 'matchresponse') ||
+                ($analysis{$part_id.'.type'} eq 'rankresponse')) {
                 my ($numbub,$numshown);
                 if ($analysis{$part_id.'.type'} eq 'optionresponse') {
                     if (ref($analysis{$part_id.'.options'}) eq 'ARRAY') {
@@ -7195,6 +7201,10 @@ sub scantron_get_maxbubble {
                     if (ref($analysis{$part_id.'.items'}) eq 'ARRAY') {
                         $numbub = scalar(@{$analysis{$part_id.'.items'}});
                     }
+                } elsif ($analysis{$part_id.'.type'} eq 'rankresponse') {
+                    if (ref($analysis{$part_id.'.foils'}) eq 'ARRAY') {
+                        $numbub = scalar(@{$analysis{$part_id.'.foils'}});
+                    }
                 }
                 if (ref($analysis{$part_id.'.shown'}) eq 'ARRAY') {
                     $numshown = scalar(@{$analysis{$part_id.'.shown'}});