--- loncom/interface/spreadsheet/assesscalc.pm	2003/07/16 16:35:45	1.16
+++ loncom/interface/spreadsheet/assesscalc.pm	2003/09/23 01:52:57	1.17.2.1
@@ -1,5 +1,5 @@
 #
-# $Id: assesscalc.pm,v 1.16 2003/07/16 16:35:45 matthew Exp $
+# $Id: assesscalc.pm,v 1.17.2.1 2003/09/23 01:52:57 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -247,7 +247,7 @@ this user and course.
 ##################################################
 sub parmval {
     my $self = shift;
-    my ($what,$symb,$uname,$udom,$csec)=@_;
+    my ($what,$symb,$uname,$udom,$csec,$recurse)=@_;
     $uname = $self->{'name'}    if (! defined($uname));
     $udom  = $self->{'domain'}  if (! defined($udom));
     $csec  = $self->{'section'} if (! defined($csec));
@@ -312,9 +312,12 @@ sub parmval {
 	if ($part eq '') { $part='0'; }
 	my $newwhat=$rwhat;
 	$newwhat=~s/\Q$space\E/$part/;
-	my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec);
+	my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1);
 	if (defined($partgeneral)) { return $partgeneral; }
     }
+    if ($recurse) { return undef; }
+    my $pack_def=&Apache::lonnet::packages_tab_default($fn,'resource.'.$what);
+    if (defined($pack_def)) { return $pack_def; }
     #nothing defined
     return '';
 }
@@ -591,7 +594,10 @@ sub compute {
         while (my ($parm,$value) = each(%parameters)) {
             last if ($self->blackout());
             next if ($parm !~ /^(parameter_.*)_problemstatus$/);
-            next if ($parameters{$1.'_answerdate'}<time);
+	    if ($parameters{$1.'_answerdate'} ne '' &&
+		$parameters{$1.'_answerdate'} < time) {
+		next;
+	    }
             if (lc($value) eq 'no') {
                 # We must blackout this sheet
                 $self->blackout(1);