--- loncom/interface/spreadsheet/assesscalc.pm 2005/02/05 06:56:24 1.36 +++ loncom/interface/spreadsheet/assesscalc.pm 2005/03/03 17:52:36 1.37 @@ -1,5 +1,5 @@ # -# $Id: assesscalc.pm,v 1.36 2005/02/05 06:56:24 albertel Exp $ +# $Id: assesscalc.pm,v 1.37 2005/03/03 17:52:36 matthew Exp $ # # Copyright Michigan State University Board of Trustees # @@ -104,6 +104,7 @@ my %nice_parameter_name; my %useropt; my %userdata; my %courseopt; +my $navmap; ######################################################## ######################################################## @@ -136,11 +137,11 @@ sub clear_package { undef(%useropt); undef(%userdata); undef(%courseopt); + undef($navmap); } sub save_cached_export_rows { my ($sname,$sdomain) = @_; - my $start = Time::HiRes::time; my $result = &Apache::lonnet::put ('nohist_calculatedsheets_'.$ENV{'request.course.id'}, $newExportrows{$sname.':'.$sdomain}, @@ -149,7 +150,15 @@ sub save_cached_export_rows { } sub initialize { + my ($in_navmap) = @_; &clear_package(); + $navmap = $in_navmap; + if (! defined($navmap)) { + $navmap = Apache::lonnavmaps::navmap->new(); + } + if (!defined($navmap)) { + &Apache::lonnet::logthis('assesscalc:Can not open Coursemap'); + } &Apache::loncoursedata::clear_internal_caches(); } @@ -165,9 +174,10 @@ sub initialize { ######################################################## ######################################################## sub initialize_package { - my ($sname,$sdomain) = @_; + my ($sname,$sdomain,$in_navmap) = @_; $current_name = $sname; $current_domain = $sdomain; + $navmap = $in_navmap; undef(%useropt); undef(%userdata); if ($current_course ne $ENV{'request.course.id'}) {