--- loncom/interface/Attic/lonspreadsheet.pm	2001/03/10 16:46:52	1.41
+++ loncom/interface/Attic/lonspreadsheet.pm	2001/03/12 18:27:46	1.43
@@ -4,7 +4,7 @@
 # 11/11,11/15,11/27,12/04,12/05,12/06,12/07,
 # 12/08,12/09,12/11,12/12,12/15,12/16,12/18,12/19,12/30,
 # 01/01/01,02/01,03/01,19/01,20/01,22/01,
-# 03/05,03/08,03/10 Gerd Kortemeyer
+# 03/05,03/08,03/10,03/12 Gerd Kortemeyer
 
 package Apache::lonspreadsheet;
             
@@ -326,7 +326,8 @@ sub sett {
     } keys %f;
     map {
 	if (($f{$_}) && ($_!~/template\_/)) {
-            if ($_=~/^$pattern/) {
+            my $matches=($_=~/^$pattern(\d+)/);
+            if  (($matches) && ($1)) {
 	        unless ($f{$_}=~/^\!/) {
 		    $t{$_}=$c{$_};
                 }
@@ -1200,7 +1201,7 @@ sub loadstudent {
     map {
 	if ($_=~/^A(\d+)/) {
 	   my $row=$1;
-           unless ($f{$_}=~/^\!/) {
+           unless (($f{$_}=~/^\!/) || ($row==0)) {
 	      @assessdata=&exportsheet(&getuname($safeeval),
                                        &getudom($safeeval),
                                        'assesscalc',$f{$_});
@@ -1251,14 +1252,14 @@ sub loadcourse {
       '<form name=popremain>'+
       '<input type=text size=35 name=remaining value=Starting></form>'+
       '</body></html>');
-    popwin.document.close;
+    popwin.document.close();
 </script>
 ENDPOP
     $r->rflush();
     map {
 	if ($_=~/^A(\d+)/) {
 	   my $row=$1;
-           unless ($f{$_}=~/^\!/) {
+           unless (($f{$_}=~/^\!/)  || ($row==0)) {
 	      my @studentdata=&exportsheet(split(/\:/,$f{$_}),
                                            'studentcalc');
               undef %userrdatas;
@@ -1289,7 +1290,7 @@ ENDPOP
     } keys %f;
     &setformulas($safeeval,%f);
     &setconstants($safeeval,%c);
-    $r->print('<script>popwin.close</script>');
+    $r->print('<script>popwin.close()</script>');
     $r->rflush(); 
 }