--- loncom/interface/spreadsheet/studentcalc.pm	2005/05/13 20:30:14	1.31
+++ loncom/interface/spreadsheet/studentcalc.pm	2005/08/05 20:06:22	1.34
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.31 2005/05/13 20:30:14 albertel Exp $
+# $Id: studentcalc.pm,v 1.34 2005/08/05 20:06:22 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -124,6 +124,7 @@ sub clear_package {
     undef(@Sequences);
     undef(%Exportrows);
     undef(%res_memoize);
+    undef($navmap);
     &Apache::assesscalc::clear_package();
 }
 
@@ -457,7 +458,7 @@ sub put_sequence_data_in_safe_space {
         # 1. duplicate titles - they get the total for the titles
         # 2. control characters in titles - use q{} around the string to
         #    deal with it.  
-        my $title = &HTML::Entities::decode($seq->{'title'});
+        my $title = &HTML::Entities::decode($seq->title());
         $title =~ s/&\#058;/:/g;
         if (@Rows) {
             $data .= 'push(@{$Sequence_Rows{"'.quotemeta($title).'"}},'.
@@ -503,8 +504,6 @@ END
 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'} ||
         ! @Sequences ) {
@@ -522,7 +521,6 @@ sub compute {
     my %c = $self->constants();
     foreach my $seq (@Sequences) {
         foreach my $resource (&get_resources($seq)) {
-            if ($connection->aborted()) { $self->cleanup(); return; }
             my $rownum = $self->get_row_number_from_key($resource->symb);
             my $cell = 'A'.$rownum;
             my $assess_filename = 'Default';
@@ -532,7 +530,6 @@ sub compute {
                 $self->{'row_source'}->{$rownum} = $assess_filename;
             }
             $f{$cell} = $resource->symb.'__&&&__'.$assess_filename;
-            if ($connection->aborted()) { $self->cleanup(); return; }
             my $assessSheet;
                 $assessSheet = Apache::assesscalc->new($self->{'name'},
                                                        $self->{'domain'},
@@ -546,7 +543,6 @@ sub compute {
                 $assessSheet->get_title(),$rownum,$assessSheet->calcerror()));
             }
             #
-            if ($connection->aborted()) { $self->cleanup(); return; }
             if ($assessSheet->blackout()) {
                 $self->blackout(1);
                 $self->{'blackout_rows'}->{$rownum} = 1;