--- loncom/homework/grades.pm	2008/12/10 21:30:38	1.528.2.1
+++ loncom/homework/grades.pm	2008/12/22 15:13:45	1.528.2.3
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # The LON-CAPA Grading handler
 #
-# $Id: grades.pm,v 1.528.2.1 2008/12/10 21:30:38 raeburn Exp $
+# $Id: grades.pm,v 1.528.2.3 2008/12/22 15:13:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2796,8 +2796,10 @@ 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.
-                        ') while trying to upload '.$newflg.'_'.$part_resp.'_returndoc'.$file_counter.'</span><br />');
+                        $request->print('<br /><span class="LC_error">'.
+                            &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);
@@ -7333,22 +7335,7 @@ sub scantron_get_maxbubble {
     foreach my $resource (@resources) {
         my $symb = $resource->symb();
 
-        my (@parts,@allparts,@possible_parts);
-
-        # Need to retrieve part IDs and response IDs because essayresponse,
-        # reactionresponse and organicresponse items are not included in 
-        # $analysis{'parts'} from lonnet::ssi.  
-        if (ref($resource->parts()) eq 'ARRAY') {
-            foreach my $part (@{$resource->parts()}) {
-                if (!&Apache::loncommon::check_if_partid_hidden($part,$symb,$udom,$uname)) {
-                    my @resp_ids = $resource->responseIds($part);
-                    foreach my $id (@resp_ids) {
-                        my $part_id = $part.'.'.$id;
-                        push(@possible_parts,$part_id);
-                    }
-                }
-            }
-        }
+        my @parts;
 
         my $result=&ssi_with_retries($resource->src(), $ssi_retries,
                                         ('symb' => $symb,
@@ -7369,21 +7356,8 @@ sub scantron_get_maxbubble {
                 }
             }
         }
-        # Add part_ids for any essayresponse, reactionresponse or 
-        # organicresponse items. 
-        foreach my $part_id (@possible_parts) {
-            if (grep(/^\Q$part_id\E$/,@parts)) {
-                push(@allparts,$part_id);
-            } else {
-                if (($analysis{$part_id.'.type'} eq 'essayresponse') ||
-                    ($analysis{$part_id.'.type'} eq 'reactionresponse') ||
-                    ($analysis{$part_id.'.type'} eq 'organicresponse')) {
-                    push(@allparts,$part_id);
-                }
-            }
-        }
 
-	foreach my $part_id (@allparts) {
+	foreach my $part_id (@parts) {
             my $lines;
 
 	    # TODO - make this a persistent hash not an array.