--- loncom/interface/Attic/lonspreadsheet.pm 2003/03/14 21:34:04 1.160.2.1 +++ loncom/interface/Attic/lonspreadsheet.pm 2003/01/13 14:58:28 1.161 @@ -1,5 +1,5 @@ # -# $Id: lonspreadsheet.pm,v 1.160.2.1 2003/03/14 21:34:04 albertel Exp $ +# $Id: lonspreadsheet.pm,v 1.161 2003/01/13 14:58:28 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -2094,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'); } @@ -2582,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