--- loncom/interface/spreadsheet/studentcalc.pm	2005/04/07 06:56:23	1.30
+++ loncom/interface/spreadsheet/studentcalc.pm	2005/08/26 20:46:46	1.35
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.30 2005/04/07 06:56:23 albertel Exp $
+# $Id: studentcalc.pm,v 1.35 2005/08/26 20:46:46 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -101,22 +101,30 @@ sub initialize_sequence_cache {
     for my $sequence ($navmap->getById('0.0'), @all_sequences) {
 	if ($navmap->hasResource($sequence,sub { shift->is_problem(); }, 0)){
             push(@Sequences,$sequence);
+	    &get_resources($sequence);
         }
     }
 }
 
+my %res_memoize;
 sub get_resources {
     my ($seq) = @_;
+    if (exists($res_memoize{$seq->symb()})) {
+	return @{$res_memoize{$seq->symb()}};
+    }
     return () if (! defined($navmap) || ! ref($navmap));
     my @resources = $navmap->retrieveResources($seq,
                                                sub { shift->is_problem(); },
                                                0,0,0);
+    $res_memoize{$seq->symb()}=\@resources;
     return @resources;
 }
 
 sub clear_package {
     undef(@Sequences);
     undef(%Exportrows);
+    undef(%res_memoize);
+    undef($navmap);
     &Apache::assesscalc::clear_package();
 }
 
@@ -450,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).'"}},'.
@@ -496,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 ) {
@@ -515,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';
@@ -525,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'},
@@ -539,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;
@@ -582,6 +585,7 @@ sub compute {
 
 sub set_row_sources {
     my $self = shift;
+    $self->check_formulas_loaded();
     while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
         next if ($cell !~ /^A(\d+)$/ || $1 < 1);
         my $row = $1;
@@ -594,6 +598,7 @@ sub set_row_sources {
 
 sub set_row_numbers {
     my $self = shift;
+    $self->check_formulas_loaded();
     while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
         next if ($cell !~ /^A(\d+)/);
         my $row = $1;