--- loncom/interface/spreadsheet/studentcalc.pm	2005/03/03 17:52:36	1.28
+++ loncom/interface/spreadsheet/studentcalc.pm	2005/05/17 17:48:19	1.33
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.28 2005/03/03 17:52:36 matthew Exp $
+# $Id: studentcalc.pm,v 1.33 2005/05/17 17:48:19 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -74,15 +74,15 @@ sub initialize {
 }
 
 sub initialize_package {
-    $current_course = $ENV{'request.course.id'};
+    $current_course = $env{'request.course.id'};
     &initialize_sequence_cache();
     &load_cached_export_rows();
 }
 
 sub ensure_correct_sequence_data {
-    if ($current_course ne $ENV{'request.course.id'}) {
+    if ($current_course ne $env{'request.course.id'}) {
         &initialize_sequence_cache();
-        $current_course = $ENV{'request.course.id'};
+        $current_course = $env{'request.course.id'};
     }
     return;
 }
@@ -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();
 }
 
@@ -137,8 +145,8 @@ sub get_html_title {
     my $self = shift;
     my ($name,$desc,$time) = $self->get_title();
     my $title = '<h1>'.$name;
-    if ($ENV{'user.name'} ne $self->{'name'} && 
-        $ENV{'user.domain'} ne $self->{'domain'}) {
+    if ($env{'user.name'} ne $self->{'name'} && 
+        $env{'user.domain'} ne $self->{'domain'}) {
         $title .= ' '.&Apache::loncommon::aboutmewrapper
                                     ($self->{'name'}.'@'.$self->{'domain'},
                                      $self->{'name'},$self->{'domain'});
@@ -173,7 +181,7 @@ sub outsheet_html {
     ####################################
     my @AssessFileNames = $self->othersheets('assesscalc');
     my $editing_is_allowed = &Apache::lonnet::allowed('mgr',
-                                                $ENV{'request.course.id'});
+                                                $env{'request.course.id'});
     ####################################
     # Report any calculation errors    #
     ####################################
@@ -221,7 +229,7 @@ END
         $r->print($tableheader);
         #
         # Print out template row
-        if (exists($ENV{'request.role.adv'}) && $ENV{'request.role.adv'}) {
+        if (exists($env{'request.role.adv'}) && $env{'request.role.adv'}) {
             $r->print('<tr><td>Template</td><td>&nbsp;</td>'.
                       $self->html_template_row($num_uneditable,
                                                $importcolor)."</tr>\n");
@@ -234,7 +242,7 @@ END
     $r->print("</table>\n");
     #
     # Prepare to output rows
-    if (exists($ENV{'request.role.adv'}) && $ENV{'request.role.adv'}) {
+    if (exists($env{'request.role.adv'}) && $env{'request.role.adv'}) {
         $tableheader =<<"END";
 </p><p>
 <table border="2">
@@ -319,7 +327,7 @@ sub assess_file_selector {
     if (!defined($AssessFiles) || ! @$AssessFiles) {
         return '';
     }
-    return '' if (! &Apache::lonnet::allowed('mgr',$ENV{'request.course.id'}));
+    return '' if (! &Apache::lonnet::allowed('mgr',$env{'request.course.id'}));
     my $element_name = 'FileSelect_'.$row;
     my $load_dialog = '<select size="1" name="'.$element_name.'" '.
         'onchange="'.
@@ -387,12 +395,12 @@ sub excel_rows {
     # writes the meat of the spreadsheet to an excel worksheet.  Called
     # by Spreadsheet::outsheet_excel;
     my $self = shift;
-    my ($connection,$worksheet,$cols_output,$rows_output) = @_;
+    my ($connection,$worksheet,$cols_output,$rows_output,$format) = @_;
     #
     # Write a header row
     $cols_output = 0;
     foreach my $value ('Container','Assessment title') {
-        $worksheet->write($rows_output,$cols_output++,&mt($value));
+        $worksheet->write($rows_output,$cols_output++,&mt($value),$format->{'h4'});
     }
     $rows_output++;    
     #
@@ -496,12 +504,10 @@ 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'} ||
+        $current_course ne $env{'request.course.id'} ||
         ! @Sequences ) {
-        $current_course = $ENV{'request.course.id'};
+        $current_course = $env{'request.course.id'};
         &clear_package();
         &initialize_sequence_cache();
     }
@@ -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;
@@ -632,12 +635,12 @@ These rows are saved in the courses dire
 sub load_cached_export_rows {
     undef(%Exportrows);
     my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets',
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.domain'},
-		     $ENV{'course.'.$ENV{'request.course.id'}.'.num'},undef);
+		     $env{'course.'.$env{'request.course.id'}.'.domain'},
+		     $env{'course.'.$env{'request.course.id'}.'.num'},undef);
     my %Selected_Assess_Sheet;
     if ($tmp[0] =~ /^error/) {
         &Apache::lonnet::logthis('unable to read cached student export rows '.
-                                 'for course '.$ENV{'request.course.id'});
+                                 'for course '.$env{'request.course.id'});
         return;
     }
     my %tmp = @tmp;