--- loncom/interface/Attic/lonspreadsheet.pm	2003/03/19 17:16:23	1.160.2.4
+++ loncom/interface/Attic/lonspreadsheet.pm	2003/01/13 14:58:28	1.161
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.160.2.4 2003/03/19 17:16:23 matthew Exp $
+# $Id: lonspreadsheet.pm,v 1.161 2003/01/13 14:58:28 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -833,7 +833,7 @@ sub expandnamed {
             push @matches,$parameter if ($parameter =~ /$expression/);
         }
         if (scalar(@matches) == 0) {
-            $returnvalue = undef; #'unmatched parameter: '.$parameter;
+            $returnvalue = 'unmatched parameter: '.$parameter;
         } elsif (scalar(@matches) == 1) {
             $returnvalue = '$c{\''.$matches[0].'\'}';
         } elsif (scalar(@matches) > 0) {
@@ -1882,14 +1882,6 @@ sub makenewsheet {
     $sheet->{'mapid'} = $ENV{'form.mapid'};
     $sheet->{'resid'} = $ENV{'form.resid'};
     $sheet->{'cid'}   = $ENV{'request.course.id'};
-    if (! exists($Section{$uname.':'.$udom})) {
-        my $classlist = &Apache::loncoursedata::get_classlist();
-        foreach my $student (keys(%$classlist)) {
-            my ($studentDomain,$studentName,undef,undef,undef,$studentSection,
-                undef,undef)   =   @{$classlist->{$student}};
-            $Section{$studentName.':'.$studentDomain} = $studentSection;
-        }
-    }
     $sheet->{'csec'}  = $Section{$uname.':'.$udom};
     $sheet->{'coursefilename'}   = $ENV{'request.course.fn'};
     $sheet->{'cnum'}  = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
@@ -2102,27 +2094,8 @@ sub parmval {
     # second, check map parms
     my $thisparm = $parmhash{$symbparm};
     return $thisparm if (defined($thisparm));
-
     # first, check default
-    $thisparm = &Apache::lonnet::metadata($fn,$rwhat.'.default');
-    return $thisparm if (defined($thisparm));
-
-    #Cascade Up
-    my $space=$what;
-    $space=~s/\.\w+$//;
-    if ($space ne '0') {
-	my @parts=split(/_/,$space);
-	my $id=pop(@parts);
-	my $part=join('_',@parts);
-	if ($part eq '') { $part='0'; }
-	my $newwhat=$rwhat;
-	$newwhat=~s/\Q$space\E/$part/;
-	my $partgeneral=&parmval($newwhat,$sheet);
-	if (defined($partgeneral)) { return $partgeneral; }
-    }
-
-    #nothing defined
-    return '';
+    return &Apache::lonnet::metadata($fn,$rwhat.'.default');
 }
 
 
@@ -2590,11 +2563,6 @@ sub loadassessment {
         # restore individual
         #
         %returnhash = &Apache::lonnet::restore($symb,$namespace,$udom,$uname);
-        for (my $version=1;$version<=$returnhash{'version'};$version++) {
-            foreach (split(/\:/,$returnhash{$version.':keys'})) {
-                $returnhash{$_}=$returnhash{$version.':'.$_};
-            } 
-        }
     }
     #
     # returnhash now has all stores for this resource
@@ -3035,9 +3003,9 @@ sub handler {
                                              $ENV{'form.ufn'} eq 'default')) {
         $ENV{'form.ufn'}='default_'.$1;
     }
-#    if (!$ENV{'form.ufn'} || $ENV{'form.ufn'} eq 'default') {
-#        $ENV{'form.ufn'}='course_default_'.$sheettype;
-#    }
+    if (!$ENV{'form.ufn'} || $ENV{'form.ufn'} eq 'default') {
+        $ENV{'form.ufn'}='course_default_'.$sheettype;
+    }
     #
     # Interactive loading of specific sheet?
     #
@@ -3239,7 +3207,6 @@ ENDSCRIPT
         $oldsheets{'course'} ne $sheet->{'cid'}) {
         undef %oldsheets;
         undef %loadedcaches;
-        undef %Section;
     }
     $oldsheets{'course'} = $sheet->{'cid'};
     #