Diff for /loncom/interface/spreadsheet/assesscalc.pm between versions 1.2 and 1.3

version 1.2, 2003/05/19 15:48:18 version 1.3, 2003/05/22 20:06:09
Line 172  sub load_parameter_caches { Line 172  sub load_parameter_caches {
         my $id  = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};          my $id  = $ENV{'course.'.$ENV{'request.course.id'}.'.num'};
         my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id);          my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id);
         while (my ($name,$value) = each(%Tmp)) {          while (my ($name,$value) = each(%Tmp)) {
             $courseopt{$userprefix.$name}=$value;              $courseopt{$name}=$value;
         }          }
     }      }
     if (! %useropt) {      if (! %useropt) {
Line 199  sub load_parameter_caches { Line 199  sub load_parameter_caches {
   
 ########################################################  ########################################################
 ########################################################  ########################################################
   
 sub ensure_current_parameter_caches {  sub ensure_current_parameter_caches {
     my $self = shift;      my $self = shift;
     if (! defined($current_course) ||       if (! defined($current_course) || 
Line 259  sub parmval { Line 258  sub parmval {
     #      #
     my $symbparm = $symb.'.'.$what;      my $symbparm = $symb.'.'.$what;
     my $mapparm  = $mapname.'___(all).'.$what;      my $mapparm  = $mapname.'___(all).'.$what;
       my $courseprefix = $self->{'cid'};
     my $usercourseprefix = $uname.'_'.$udom.'_'.$self->{'cid'};      my $usercourseprefix = $uname.'_'.$udom.'_'.$self->{'cid'};
     #      #
     my $seclevel  = $usercourseprefix.'.['.$csec.'].'.$what;      my $seclevel  = $courseprefix.'.['.$csec.'].'.$what;
     my $seclevelr = $usercourseprefix.'.['.$csec.'].'.$symbparm;      my $seclevelr = $courseprefix.'.['.$csec.'].'.$symbparm;
     my $seclevelm = $usercourseprefix.'.['.$csec.'].'.$mapparm;      my $seclevelm = $courseprefix.'.['.$csec.'].'.$mapparm;
     #      #
     my $courselevel  = $usercourseprefix.'.'.$what;      my $courselevel  = $courseprefix.'.'.$what;
     my $courselevelr = $usercourseprefix.'.'.$symbparm;      my $courselevelr = $courseprefix.'.'.$symbparm;
     my $courselevelm = $usercourseprefix.'.'.$mapparm;      my $courselevelm = $courseprefix.'.'.$mapparm;
       #
       my $ucourselevel  = $usercourseprefix.'.'.$what;
       my $ucourselevelr = $usercourseprefix.'.'.$symbparm;
       my $ucourselevelm = $usercourseprefix.'.'.$mapparm;
    # check user     # check user
     if (defined($uname)) {      if (defined($uname)) {
         return $useropt{$courselevelr} if (defined($useropt{$courselevelr}));          return $useropt{$ucourselevelr} if (defined($useropt{$ucourselevelr}));
         return $useropt{$courselevelm} if (defined($useropt{$courselevelm}));          return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm}));
         return $useropt{$courselevel}  if (defined($useropt{$courselevel}));          return $useropt{$ucourselevel}  if (defined($useropt{$ucourselevel}));
     }      }
     # check section      # check section
     if (defined($csec)) {      if (defined($csec)) {
Line 490  sub compute { Line 494  sub compute {
     if (tie(%parmhash,'GDBM_File',      if (tie(%parmhash,'GDBM_File',
             $self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {              $self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
         foreach my $parmname (keys(%parameters)) {          foreach my $parmname (keys(%parameters)) {
             my $value =  $self->parmval($parmname);              my $value = $self->parmval($parmname);
             $parameters{$parmname} =$value;              $parameters{$parmname} =$value;
         }          }
         untie(%parmhash);          untie(%parmhash);
Line 522  sub compute { Line 526  sub compute {
     while (my ($parm,$value) = each(%parameters)) {      while (my ($parm,$value) = each(%parameters)) {
         my $cell = 'A'.$self->get_row_number_from_key($parm);          my $cell = 'A'.$self->get_row_number_from_key($parm);
         $f{$cell} = $parm;          $f{$cell} = $parm;
         $c{$parm} = $value;          $c{$parm} = '"'.$value.'"';
     }      }
     $self->formulas(%f);      $self->formulas(%f);
     $self->constants(%c);      $self->constants(%c);
Line 604  These rows are saved in the students dir Line 608  These rows are saved in the students dir
 ########################################################  ########################################################
 sub load_cached_export_rows {  sub load_cached_export_rows {
     %Exportrows = undef;      %Exportrows = undef;
     &Apache::lonnet::logthis("loading cached assess sheets for $current_name $current_domain");  
     my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'.      my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'.
                                     $ENV{'request.course.id'},                                      $ENV{'request.course.id'},
                                     $current_domain,$current_name,undef);                                      $current_domain,$current_name,undef);

Removed from v.1.2  
changed lines
  Added in v.1.3


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>