--- loncom/interface/spreadsheet/assesscalc.pm 2003/09/12 19:00:54 1.22 +++ loncom/interface/spreadsheet/assesscalc.pm 2003/10/02 17:07:41 1.25 @@ -1,5 +1,5 @@ # -# $Id: assesscalc.pm,v 1.22 2003/09/12 19:00:54 matthew Exp $ +# $Id: assesscalc.pm,v 1.25 2003/10/02 17:07:41 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,6 +50,7 @@ use Apache::Constants qw(:common :http); use Apache::lonnet; use Apache::loncommon; use Apache::Spreadsheet; +use Apache::loncoursedata(); use HTML::Entities(); use Spreadsheet::WriteExcel; use GDBM_File; @@ -148,6 +149,7 @@ sub save_cached_export_rows { sub initialize { &clear_package(); + &Apache::loncoursedata::clear_internal_caches(); } ######################################################## @@ -173,6 +175,7 @@ sub initialize_package { } &load_cached_export_rows(); &load_parameter_caches(); + &Apache::loncoursedata::clear_internal_caches(); } @@ -563,7 +566,7 @@ sub get_parm_names { my @Mandatory_parameters = @_; my %parameters_and_names; # - my ($symap,$syid,$srcf)=split(/___/,$self->{'symb'}); + my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'}); my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); foreach my $parm (@Mandatory_parameters,@Metadata) { next if ($parm !~ /^(resource\.|stores|parameter)_/); @@ -689,7 +692,7 @@ sub compute { while (my ($parm,$value) = each(%parameters)) { last if ($self->blackout()); next if ($parm !~ /^(parameter_.*)_problemstatus$/); - if ($parameters{$1.'_answerdate'} eq '' || + if ($parameters{$1.'_answerdate'} ne '' && $parameters{$1.'_answerdate'} < time) { next; }