--- loncom/interface/spreadsheet/Spreadsheet.pm	2005/09/01 21:47:14	1.55
+++ loncom/interface/spreadsheet/Spreadsheet.pm	2005/10/12 21:48:32	1.57
@@ -1,5 +1,5 @@
 #
-# $Id: Spreadsheet.pm,v 1.55 2005/09/01 21:47:14 albertel Exp $
+# $Id: Spreadsheet.pm,v 1.57 2005/10/12 21:48:32 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -213,16 +213,8 @@ course environment.  Returns 0 otherwise
 sub is_default {
     my $self = shift;
     # Check to find out if we are the default spreadsheet (filenames match)
-    my $default_filename = '';
-    my %tmphash = &Apache::lonnet::get('environment',
-                                       ['spreadsheet_default_'.
-                                        $self->{'type'}],
-                                       $self->{'cdom'},
-                                       $self->{'cnum'});
-    my ($tmp) = keys(%tmphash);
-    if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
-        $default_filename = $tmphash{'spreadsheet_default_'.$self->{'type'}};
-    }
+    my $default_filename = $env{'course.'.$self->{'cid'}.
+				    '.spreadsheet_default_'.$self->{'type'}};
     if ($default_filename =~ /^\s*$/) {
         $default_filename = 'default_'.$self->{'type'};
     }
@@ -1631,7 +1623,7 @@ sub load {
         $self->{'row_source'}=$spreadsheets{$cachekey}->{'row_source'};
         $self->{'row_numbers'}=$spreadsheets{$cachekey}->{'row_numbers'};
         $self->{'maxrow'}=$spreadsheets{$cachekey}->{'maxrow'};
-   } else {
+    } else {
         # Not cached, need to read
         if (! defined($filename)) {
             $formulas = $self->load_system_default_sheet();
@@ -1664,24 +1656,33 @@ sub load {
                 $formulas = $self->load_system_default_sheet();
             }
         }
-        $filename=$self->filename(); # filename may have changed
-	$cachekey = join('_',($cnum,$cdom,$stype,$filename));
-	if (ref($formulas) eq 'HASH') {
-	    %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};
-	}
 	$self->formulas($formulas);
 	$self->set_row_sources();
 	$self->set_row_numbers();
-	if (ref($self->{'row_source'})) {
-	    %{$spreadsheets{$cachekey}->{'row_source'}} = 
-		%{$self->{'row_source'}};
-	}
-	if (ref($self->{'row_numbers'})) {
-	    %{$spreadsheets{$cachekey}->{'row_numbers'}} = 
-		%{$self->{'row_numbers'}};
-	}
-        $spreadsheets{$cachekey}->{'maxrow'} = $self->{'maxrow'};
+	$self->cache_sheet($formulas);
+    }
+}
+
+sub cache_sheet {
+    my $self = shift;
+    my $formulas=(@_);
+    my $stype = $self->{'type'};
+    my $cnum  = $self->{'cnum'};
+    my $cdom  = $self->{'cdom'};
+    #
+    my $filename = $self->filename();
+    my $cachekey = join('_',($cnum,$cdom,$stype,$filename));
+
+    if (ref($self->{'formulas'}) eq 'HASH') {
+	%{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};
+    }
+    if (ref($self->{'row_source'})) {
+	%{$spreadsheets{$cachekey}->{'row_source'}} =%{$self->{'row_source'}};
+    }
+    if (ref($self->{'row_numbers'})) {
+	%{$spreadsheets{$cachekey}->{'row_numbers'}}=%{$self->{'row_numbers'}};
     }
+    $spreadsheets{$cachekey}->{'maxrow'} = $self->{'maxrow'};
 }
 
 sub set_row_sources {
@@ -1733,9 +1734,8 @@ sub save {
         my $cnum  = $self->{'cnum'};
         my $cdom  = $self->{'cdom'};
         my $filename    = $self->{'filename'};
-        my $cachekey = join('_',($cnum,$cdom,$stype,$filename));
         # Cache new sheet
-        %{$spreadsheets{$cachekey}->{'formulas'}}=%f;
+	$self->cache_sheet(\%f);
         # Write sheet
         foreach (keys(%f)) {
             delete($f{$_}) if ($f{$_} eq 'import');