--- loncom/interface/spreadsheet/studentcalc.pm	2003/11/17 19:55:41	1.24
+++ loncom/interface/spreadsheet/studentcalc.pm	2004/11/02 20:48:02	1.26
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.24 2003/11/17 19:55:41 matthew Exp $
+# $Id: studentcalc.pm,v 1.26 2004/11/02 20:48:02 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,12 +111,8 @@ sub get_title {
     my @title = ();
     #
     # Determine the students name
-    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,$self->{'coursedesc'});
     push (@title,&Apache::lonlocal::locallocaltime(time));
@@ -363,7 +359,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,
@@ -389,7 +385,7 @@ 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) = @_;
     #
     # Write a header row
     $cols_output = 0;