--- loncom/interface/spreadsheet/Spreadsheet.pm	2007/01/23 02:14:18	1.76
+++ loncom/interface/spreadsheet/Spreadsheet.pm	2013/08/09 17:58:15	1.82
@@ -1,5 +1,5 @@
 #
-# $Id: Spreadsheet.pm,v 1.76 2007/01/23 02:14:18 albertel Exp $
+# $Id: Spreadsheet.pm,v 1.82 2013/08/09 17:58:15 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -210,8 +210,8 @@ sub make_default {
             {'spreadsheet_default_'.$self->{'type'} => $self->filename()},
                                      $self->{'cdom'},$self->{'cnum'});
     return $result if ($result ne 'ok');
-    &Apache::lonnet::appenv('course.'.$self->{'cid'}.'.spreadsheet_default_'.
-			    $self->{'type'} => $self->filename());
+    &Apache::lonnet::appenv({'course.'.$self->{'cid'}.'.spreadsheet_default_'.
+			    $self->{'type'} => $self->filename()});
     my $symb = $self->{'symb'};
     $symb = '' if (! defined($symb));
     &Apache::lonnet::expirespread('','',$self->{'type'},$symb);    
@@ -726,7 +726,7 @@ sub get_values {
 	my @num=($ld..$ud);
 	foreach my $a (@alpha) {
 	    foreach my $n (@num) {
-		if (exists($sheet_values{$a.$n})) {
+		if ((exists($sheet_values{$a.$n})) && ($sheet_values{$a.$n} ne '')) {
 		    push(@values,$sheet_values{$a.$n});
 		}
 	    }
@@ -742,8 +742,10 @@ sub get_values {
         $alpha=qq/[$la-$ua]/;
     }
     my $expression = '^'.$alpha.$num.'$';
-    foreach (grep /$expression/,keys(%sheet_values)) {
-	push(@values,$sheet_values{$_});
+    foreach my $item (grep(/$expression/,keys(%sheet_values))) {
+        unless ($sheet_values{$item} eq '') {
+	    push(@values,$sheet_values{$item});
+        }
     }
     return \@values;
 }
@@ -1525,16 +1527,20 @@ sub outsheet_csv   {
     my $csvdata = '';
     my @Values;
     #
-    # Open the csv file
+    # Open the CSV file
     my $filename = '/prtspool/'.
         $env{'user.name'}.'_'.$env{'user.domain'}.'_'.
         time.'_'.rand(1000000000).'.csv';
     my $file;
     unless ($file = Apache::File->new('>'.'/home/httpd'.$filename)) {
         $r->log_error("Couldn't open $filename for output $!");
-        $r->print(&mt("Problems occured in writing the csv file.  ".
-                  "This error has been logged.  ".
-                  "Please alert your LON-CAPA administrator."));
+        $r->print(
+            '<p class="LC_error">'
+           .&mt('Problems occurred in writing the CSV file.')
+           .' '.&mt('This error has been logged.')
+           .' '.&mt('Please alert your LON-CAPA administrator.')
+           .'</p>'
+        );
         $r->print("<pre>\n".$csvdata."</pre>\n");
         return 0;
     }
@@ -1547,7 +1553,7 @@ sub outsheet_csv   {
     # Output the body of the spreadsheet
     $self->csv_rows($connection,$file);
     #
-    # Close the csv file
+    # Close the CSV file
     close($file);
     $r->print('<br /><br />'.
               '<a href="'.$filename.'">'.&mt('Your CSV spreadsheet.').'</a>'."\n");
@@ -1809,16 +1815,14 @@ sub save {
                                 {'spreadsheet_default_'.$stype => $filename },
                                           $cdom,$cnum);
             return $reply if ($reply ne 'ok');
-	    &Apache::lonnet::appenv('course.'.$self->{'cid'}.'.spreadsheet_default_'.
-				    $self->{'type'} => $self->filename());
+	    &Apache::lonnet::appenv({'course.'.$self->{'cid'}.'.spreadsheet_default_'.
+				    $self->{'type'} => $self->filename()});
         } 
-        if ($self->is_default()) {
-            if ($self->{'type'} eq 'studentcalc') {
-                &Apache::lonnet::expirespread('','','studentcalc','');
-            } elsif ($self->{'type'} eq 'assesscalc') {
-                &Apache::lonnet::expirespread('','','assesscalc','');
-                &Apache::lonnet::expirespread('','','studentcalc','');
-            }
+	if ($self->{'type'} eq 'studentcalc') {
+	    &Apache::lonnet::expirespread('','','studentcalc','');
+	} elsif ($self->{'type'} eq 'assesscalc') {
+	    &Apache::lonnet::expirespread('','','assesscalc','');
+	    &Apache::lonnet::expirespread('','','studentcalc','');
         }
         return $reply;
     }