--- loncom/interface/spreadsheet/studentcalc.pm	2003/09/05 01:06:45	1.17
+++ loncom/interface/spreadsheet/studentcalc.pm	2003/09/05 01:57:54	1.18
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.17 2003/09/05 01:06:45 matthew Exp $
+# $Id: studentcalc.pm,v 1.18 2003/09/05 01:57:54 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -103,6 +103,7 @@ sub initialize_sequence_cache {
 sub clear_package {
     undef(@Sequences);
     undef(%Exportrows);
+    &Apache::assesscalc::clear_package();
 }
 
 sub get_title {
@@ -414,6 +415,9 @@ sub outsheet_recursive_excel {
 
 sub compute {
     my $self = shift;
+    my ($r) = @_;
+    my $connection = $r->connection();
+    if ($connection->aborted()) { $self->cleanup; return; }
     if (! defined($current_course) ||
         $current_course ne $ENV{'request.course.id'}) {
         $current_course = $ENV{'request.course.id'};
@@ -440,6 +444,7 @@ sub compute {
     foreach my $seq (@sequences) {
         next if ($seq->{'num_assess'}<1);
         foreach my $resource (@{$seq->{'contents'}}) {
+            if ($connection->aborted()) { $self->cleanup(); return; }
             next if ($resource->{'type'} ne 'assessment');
             my $rownum = $self->get_row_number_from_key($resource->{'symb'});
             my $cell = 'A'.$rownum;
@@ -450,11 +455,13 @@ sub compute {
                 $self->{'row_source'}->{$rownum} = $assess_filename;
             }
             $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 @exportdata = $assessSheet->export_data();
+            my @exportdata = $assessSheet->export_data($r);
+            if ($connection->aborted()) { $self->cleanup(); return; }
             if ($assessSheet->blackout()) {
                 $self->blackout(1);
                 $self->{'blackout_rows'}->{$rownum} = 1;
@@ -615,6 +622,8 @@ spreadsheet only if necessary.
 #############################################
 sub export_data {
     my $self = shift;
+    my ($r) = @_;
+    my $connection = $r->connection();
     my $student = $self->{'name'}.':'.$self->{'domain'};
     if (! exists($Exportrows{$student}) ||
         ! defined($Exportrows{$student}) ||
@@ -623,8 +632,9 @@ sub export_data {
         ! exists($Exportrows{$student}->{'time'}) ||
         ! defined($Exportrows{$student}->{'time'}) ||
         ! $self->check_expiration_time($Exportrows{$student}->{'time'})) {
-        $self->compute();
+        $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]));