--- loncom/interface/Attic/lonspreadsheet.pm	2003/03/14 21:36:42	1.160.2.2
+++ loncom/interface/Attic/lonspreadsheet.pm	2003/01/15 19:34:03	1.163
@@ -1,5 +1,5 @@
 #
-# $Id: lonspreadsheet.pm,v 1.160.2.2 2003/03/14 21:36:42 albertel Exp $
+# $Id: lonspreadsheet.pm,v 1.163 2003/01/15 19:34:03 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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,$symb,$uname,$udom,$csec);
-	if (defined($partgeneral)) { return $partgeneral; }
-    }
-
-    #nothing defined
-    return '';
+    return &Apache::lonnet::metadata($fn,$rwhat.'.default');
 }
 
 
@@ -2444,11 +2417,10 @@ sub loadstudent{
     my %formulas=&getformulas($sheet);
     $cachedassess=$sheet->{'uname'}.':'.$sheet->{'udom'};
     # Get ALL the student preformance data
-    my @tmp = &Apache::lonnet::dump($sheet->{'cid'},
-                                    $sheet->{'udom'},
-                                    $sheet->{'uname'},
-                                    undef);
-    if ($tmp[0] !~ /^error:/) {
+    my @tmp = &Apache::lonnet::currentdump($sheet->{'cid'},
+                                           $sheet->{'udom'},
+                                           $sheet->{'uname'});
+    if ((scalar @tmp > 0) && ($tmp[0] !~ /^error:/)) {
         %cachedstores = @tmp;
     }
     undef @tmp;
@@ -2578,23 +2550,16 @@ sub loadassessment {
         #
         # get data out of the dumped stores
         # 
-        my $version=$cachedstores{'version:'.$symb};
-        my $scope;
-        for ($scope=1;$scope<=$version;$scope++) {
-            foreach (split(/\:/,$cachedstores{$scope.':keys:'.$symb})) {
-                $returnhash{$_}=$cachedstores{$scope.':'.$symb.':'.$_};
-            } 
+        if (exists($cachedstores{$symb})) {
+            %returnhash = %{$cachedstores{$symb}};
+        } else {
+            %returnhash = ();
         }
     } else {
         #
         # 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
@@ -3239,7 +3204,6 @@ ENDSCRIPT
         $oldsheets{'course'} ne $sheet->{'cid'}) {
         undef %oldsheets;
         undef %loadedcaches;
-        undef %Section;
     }
     $oldsheets{'course'} = $sheet->{'cid'};
     #