--- loncom/interface/spreadsheet/assesscalc.pm	2004/02/03 22:19:47	1.31
+++ loncom/interface/spreadsheet/assesscalc.pm	2004/11/02 20:48:02	1.34
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.31 2004/02/03 22:19:47 matthew Exp $
+# $Id: assesscalc.pm,v 1.34 2004/11/02 20:48:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -397,11 +397,8 @@ sub get_full_title {
     my @title = ($self->get_title());
     # Look up the users identifying information
     # Get the users information
-    my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'},
-                                                      $self->{'domain'});
-    my $name = 
-        join(' ',@userenv{'firstname','middlename','lastname','generation'});
-    $name =~ s/\s+$//;
+    my $name = &Apache::loncommon::plainname($self->{'name'},
+					     $self->{'domain'});
     push (@title,$name);
     push (@title,&Apache::lonlocal::locallocaltime(time));
     return @title;
@@ -784,7 +781,7 @@ sub compute {
         if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) {
             $value = 'witheld';
         }
-        $value = 'q{'.$value.'}' if ($value !~/^\s*\d+(\.\d+)?\s*$/);
+        $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $c{$parm} = $value;
     }
     $self->formulas(\%f);
@@ -876,6 +873,10 @@ sub load_cached_export_rows {
         # We only got one key, so we will access it directly.
         while (my ($key,$sheetdata) = each(%tmp)) {
             my ($sname,$sdom,$sheettype,$symb) = split(':',$key);
+            if (! defined($sname) || $sname eq '' ||
+                ! defined($sdom)  || $sdom eq '' ) {
+                next;
+            }
             if ($symb =~ /\.time$/) {
                 $symb =~ s/\.time$//;
                 $Exportrows{$symb}->{'time'} = $sheetdata;