--- loncom/interface/statistics/lonstudentsubmissions.pm	2004/11/08 15:14:52	1.26
+++ loncom/interface/statistics/lonstudentsubmissions.pm	2004/12/06 16:53:39	1.29
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 #
-# $Id: lonstudentsubmissions.pm,v 1.26 2004/11/08 15:14:52 matthew Exp $
+# $Id: lonstudentsubmissions.pm,v 1.29 2004/12/06 16:53:39 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -654,6 +654,14 @@ sub prepare_excel_output {
                 }
             }
         }
+        # Fill in the remaining rows with the students data
+        for (my $row = $student_row+1;$row<=$max_row;$row++) {
+            my $cols = 0;
+            foreach my $field (@StudentColumns) {
+                $worksheet->write($row,$cols++,
+                                  $student->{$field});
+            }
+        }
         $rows_output++;
         &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state,
                                                  'last student');
@@ -817,6 +825,7 @@ sub prepare_csv_output {
     #
     # Main loop
     foreach my $student (@$students) {
+        last if ($c->aborted());
         my @rows;
         my $prob_start_idx = 0;
         foreach my $prob (@$problems) {
@@ -883,7 +892,7 @@ sub prepare_csv_output {
 sub compile_response_data {
     my ($response,$student,$prob,$partid,$respid) = @_;
     my @rowdata;
-    push(@rowdata,$response->[&Apache::loncoursedata::RDs_submission()]);
+    push(@rowdata,&Apache::lonnet::unescape($response->[&Apache::loncoursedata::RDs_submission()]));
     if ($ENV{'form.correctans'} eq 'true') {
         my $correct = &Apache::lonstathelpers::get_student_answer
             ($prob,$student->{'username'},$student->{'domain'},