--- loncom/interface/spreadsheet/studentcalc.pm	2005/04/07 06:56:23	1.30
+++ loncom/interface/spreadsheet/studentcalc.pm	2006/04/06 20:24:13	1.38
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.30 2005/04/07 06:56:23 albertel Exp $
+# $Id: studentcalc.pm,v 1.38 2006/04/06 20:24:13 raeburn 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();
 }
 
@@ -263,8 +271,17 @@ END
     }
     foreach my $Sequence (@Sequences) {
 	$r->print("<h3>".$Sequence->compTitle."</h3>\n");
+
+        my @resources = &get_resources($Sequence);
+        my $first_rownum =
+            $self->get_row_number_from_key($resources[0]->symb);
+        my $last_rownum = 
+            $self->get_row_number_from_key($resources[-1]->symb);
+        $r->print(&assess_file_selector([$first_rownum, $last_rownum],
+                                        undef, \@AssessFileNames));
+
  	$r->print($tableheader);
-	foreach my $resource (&get_resources($Sequence)) {
+	foreach my $resource (@resources) {
 	    my $rownum = $self->get_row_number_from_key($resource->symb);
             my $assess_filename = $self->{'row_source'}->{$rownum};
             my $row_output = '<tr>';
@@ -320,12 +337,25 @@ sub assess_file_selector {
         return '';
     }
     return '' if (! &Apache::lonnet::allowed('mgr',$env{'request.course.id'}));
-    my $element_name = 'FileSelect_'.$row;
+    my $element_name;
+    my $source_row = $row;
+    if (ref($row)) {
+        my ($first_rownum, $last_rownum) = @$row;
+        $element_name = "FileSelect_${first_rownum}_${last_rownum}";
+        $source_row = "${first_rownum}:${last_rownum}";
+    } else {
+        $element_name = 'FileSelect_'.$row;
+    }
     my $load_dialog = '<select size="1" name="'.$element_name.'" '.
         'onchange="'.
-        "document.sheet.cell.value='source_$row';".
+        "document.sheet.cell.value='source_${source_row}';".
         "document.sheet.newformula.value=document.sheet.$element_name\.value;".
         'document.sheet.submit()" '.'>'."\n";
+    if (ref($row)) {
+        $load_dialog .= '    <option name="" value="">' .
+            &mt("Select spreadsheet for entire sequence")
+            . "</option>\n";
+    }
     foreach my $file (@{$AssessFiles}) {
         $load_dialog .= '    <option name="'.$file.'"';
         $load_dialog .= ' selected' if ($default eq $file);
@@ -338,22 +368,36 @@ sub assess_file_selector {
 sub modify_cell {
     my $self = shift;
     my ($cell,$formula) = @_;
-    if ($cell =~ /^source_(\d+)$/) {
-        # Need to make sure $formula is a valid filename....
-        my $row = $1;
-        $cell = 'A'.$row;
+
+    my $set_row = sub {
+        my $row = shift;
+        my $formula = shift;
+        my $cell = 'A' . $row;
         $self->{'row_source'}->{$row} = $formula;
         my $original_source = $self->formula($cell);
         if ($original_source =~ /__&&&__/) {
             ($original_source,undef) = split('__&&&__',$original_source);
         }
         $formula = $original_source.'__&&&__'.$formula;
+        $self->set_formula($cell,$formula);
+    };
+
+    if ($cell =~ /^source_(\d+):(\d+)$/) {
+        my $first_row = $1;
+        my $last_row = $2;
+        for my $row ($first_row..$last_row) {
+            $set_row->($row, $formula);
+        }
+    } elsif ($cell =~ /^source_(\d+)$/) {
+        # Need to make sure $formula is a valid filename....
+        my $row = $1;
+        $set_row->($row, $formula);
     } elsif ($cell =~ /([A-z])\-/) {
         $cell = 'template_'.$1;
+        $self->set_formula($cell,$formula);
     } elsif ($cell !~ /^([A-z](\d+)|template_[A-z])$/) {
         return;
     }
-    $self->set_formula($cell,$formula);
     $self->rebuild_stats();
     return;
 }
@@ -450,7 +494,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 +540,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 +557,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,12 +566,13 @@ 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'},
                                                        $assess_filename,
-                                                       $resource->symb);
+                                                       $resource->symb,
+						       $self->{'section'},
+                                                       $self->{'group'});
             my @exportdata = $assessSheet->export_data($r);
             #
             if ($assessSheet->badcalc()) {
@@ -539,7 +581,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 +623,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 +636,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;