--- loncom/interface/spreadsheet/studentcalc.pm	2003/10/14 18:36:54	1.23
+++ loncom/interface/spreadsheet/studentcalc.pm	2003/11/17 19:55:41	1.24
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.23 2003/10/14 18:36:54 www Exp $
+# $Id: studentcalc.pm,v 1.24 2003/11/17 19:55:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -174,6 +174,10 @@ sub outsheet_html {
     my $editing_is_allowed = &Apache::lonnet::allowed('mgr',
                                                 $ENV{'request.course.id'});
     ####################################
+    # Report any calculation errors    #
+    ####################################
+    $r->print($self->html_report_error());
+    ####################################
     # Determine table structure        #
     ####################################
     my $num_uneditable = 26;
@@ -527,11 +531,19 @@ sub compute {
             }
             $f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename;
             if ($connection->aborted()) { $self->cleanup(); return; }
-            my $assessSheet = Apache::assesscalc->new($self->{'name'},
-                                                      $self->{'domain'},
-                                                      $assess_filename,
-                                                      $resource->{'symb'});
+            my $assessSheet;
+                $assessSheet = Apache::assesscalc->new($self->{'name'},
+                                                       $self->{'domain'},
+                                                       $assess_filename,
+                                                       $resource->{'symb'});
             my @exportdata = $assessSheet->export_data($r);
+            #
+            if ($assessSheet->badcalc()) {
+                $self->set_calcerror(
+            &mt('Error computing row for assessment "[_1]" (row [_2]):[_3]',
+                $assessSheet->get_title(),$rownum,$assessSheet->calcerror()));
+            }
+            #
             if ($connection->aborted()) { $self->cleanup(); return; }
             if ($assessSheet->blackout()) {
                 $self->blackout(1);
@@ -662,11 +674,16 @@ Writes the export data for this student
 #############################################
 sub save_export_data {
     my $self = shift;
-    &Apache::assesscalc::save_cached_export_rows($self->{'name'},
-                                                 $self->{'domain'});
-    return if ($self->temporary());
     my $student = $self->{'name'}.':'.$self->{'domain'};
+    return if ($self->temporary());
+    if ($self->badcalc()){
+        # do not save data away when calculations have not been done properly.
+        delete($Exportrows{$student});
+        return;
+    }
     return if (! exists($Exportrows{$student}));
+    &Apache::assesscalc::save_cached_export_rows($self->{'name'},
+                                                 $self->{'domain'});
     return if (! $self->is_default());
     my $key = join(':',($self->{'name'},$self->{'domain'},'studentcalc')).':';
     my $timekey = $key.'.time';
@@ -710,9 +727,16 @@ sub export_data {
         $self->compute($r);
     }
     if ($connection->aborted()) { $self->cleanup(); return; }
-    my @Data = @{$Exportrows{$student}->{'data'}};
-    for (my $i=0; $i<=$#Data;$i++) {
-        $Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i]));
+    my @Data;
+    if ($self->badcalc()) {
+        @Data = ();
+    } else {
+        @Data = @{$Exportrows{$student}->{'data'}};
+        for (my $i=0; $i<=$#Data;$i++) {
+            if ($Data[$i]=~/\D/ && defined($Data[$i])) {
+                $Data[$i]="'".$Data[$i]."'";
+            }
+        }
     }
     return @Data;
 }