--- loncom/interface/spreadsheet/assesscalc.pm	2003/11/17 19:55:41	1.29
+++ loncom/interface/spreadsheet/assesscalc.pm	2004/02/03 22:44:02	1.32
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.29 2003/11/17 19:55:41 matthew Exp $
+# $Id: assesscalc.pm,v 1.32 2004/02/03 22:44:02 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -531,7 +531,7 @@ sub csv_rows {
     # writes the meat of the spreadsheet to an excel worksheet.  Called
     # by Spreadsheet::outsheet_excel;
     my $self = shift;
-    my ($filehandle) = @_;
+    my ($connection,$filehandle) = @_;
     #
     # Write a header row
     $self->csv_output_row($filehandle,undef,
@@ -554,12 +554,13 @@ sub excel_rows {
     # writes the meat of the spreadsheet to an excel worksheet.  Called
     # by Spreadsheet::outsheet_excel;
     my $self = shift;
-    my ($worksheet,$cols_output,$rows_output) = @_;
+    my ($connection,$worksheet,$cols_output,$rows_output) = @_;
+    return if (! ref($worksheet));
     #
     # Write a header row
     $cols_output = 0;
     foreach my $value ('Parameter','Description','Value') {
-        $worksheet->write($rows_output,$cols_output++,&mt($value));
+        $worksheet->write($rows_output,$cols_output++,$value);
     }
     $rows_output++;    
     #
@@ -780,7 +781,10 @@ sub compute {
     while (my ($parm,$value) = each(%parameters)) {
         my $cell = 'A'.$self->get_row_number_from_key($parm);
         $f{$cell} = $parm;
-        $value = '"'.$value.'"' if ($value =~/[^0-9.]/);
+        if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {
+            $value = 'witheld';
+        }
+        $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $c{$parm} = $value;
     }
     $self->formulas(\%f);