[BACK]Return to assesscalc.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface / spreadsheet

Diff for /loncom/interface/spreadsheet/assesscalc.pm between versions 1.52 and 1.53

version 1.52, 2006/04/06 20:24:13 version 1.53, 2006/05/01 06:17:16
Line 302  this user and course. Line 302  this user and course.
 ##################################################  ##################################################
 sub parmval {  sub parmval {
     my $self = shift;      my $self = shift;
     my ($what,$symb,$uname,$udom,$csec,$recurse,$mapname,$id,$fn,$cgroup)=@_;      my ($what,$symb,$uname,$udom,$csec,$recurse,$mapname,$id,$fn,$groups)=@_;
     $uname  = $self->{'name'}    if (! defined($uname));      $uname  = $self->{'name'}     if (! defined($uname));
     $udom   = $self->{'domain'}  if (! defined($udom));      $udom   = $self->{'domain'}   if (! defined($udom));
     $csec   = $self->{'section'} if (! defined($csec));      $csec   = $self->{'section'}  if (! defined($csec));
     $cgroup = $self->{'group'}   if (! defined($cgroup));       $groups = $self->{'groups'}   if (! defined($groups)); 
     $symb   = $self->{'symb'}    if (! defined($symb));      $symb   = $self->{'symb'}     if (! defined($symb));
     #      #
     my $result='';      my $result='';
     #      #
Line 325  sub parmval { Line 325  sub parmval {
     my $courseprefix = $self->{'cid'};      my $courseprefix = $self->{'cid'};
     my $usercourseprefix = $uname.'_'.$udom.'_'.$self->{'cid'};      my $usercourseprefix = $uname.'_'.$udom.'_'.$self->{'cid'};
     #      #
     my $grplevel=$courseprefix.'.['.$cgroup.'].'.$what;  
     my $grplevelr=$courseprefix.'.['.$cgroup.'].'.$symbparm;  
     my $grplevelm=$courseprefix.'.['.$cgroup.'].'.$mapparm;  
     #  
     my $seclevel  = $courseprefix.'.['.$csec.'].'.$what;      my $seclevel  = $courseprefix.'.['.$csec.'].'.$what;
     my $seclevelr = $courseprefix.'.['.$csec.'].'.$symbparm;      my $seclevelr = $courseprefix.'.['.$csec.'].'.$symbparm;
     my $seclevelm = $courseprefix.'.['.$csec.'].'.$mapparm;      my $seclevelm = $courseprefix.'.['.$csec.'].'.$mapparm;
Line 346  sub parmval { Line 342  sub parmval {
         return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm}));          return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm}));
         return $useropt{$ucourselevel}  if (defined($useropt{$ucourselevel}));          return $useropt{$ucourselevel}  if (defined($useropt{$ucourselevel}));
     }      }
     # check group      # check groups
     if (defined($cgroup)) {      if (defined($groups) && ref($groups eq 'ARRAY')) {
         return $courseopt{$grplevelr} if (defined($courseopt{$grplevelr}));          foreach my $group (@{$groups}) {
         return $courseopt{$grplevelm} if (defined($courseopt{$grplevelm}));              foreach my $level ($symbparm,$mapparm,$what) {
         return $courseopt{$grplevel}  if (defined($courseopt{$grplevel}));                  my $item = $courseprefix.'.['.$group.'].'.$level;
                   if (defined($courseopt{$item})) {
                       return $courseopt{$item};
                   }
               }
           }
     }      }
     # check section      # check section
     if (defined($csec)) {      if (defined($csec)) {
Line 382  sub parmval { Line 383  sub parmval {
  my $newwhat=$rwhat;   my $newwhat=$rwhat;
  $newwhat=~s/\Q$space\E/$part/;   $newwhat=~s/\Q$space\E/$part/;
  my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1,   my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1,
        $mapname,$id,$fn);         $mapname,$id,$fn,$groups);
  if (defined($partgeneral)) { return $partgeneral; }   if (defined($partgeneral)) { return $partgeneral; }
     }      }
     if ($recurse) { return undef; }      if ($recurse) { return undef; }
Line 647  sub get_parameter_values { Line 648  sub get_parameter_values {
             my $value = $self->parmval($parmname,$self->{'symb'},              my $value = $self->parmval($parmname,$self->{'symb'},
        $self->{'name'},$self->{'domain'},         $self->{'name'},$self->{'domain'},
        $self->{'section'},undef,         $self->{'section'},undef,
        $mapname,$id,$fn);         $mapname,$id,$fn,$self->{'groups'});
             $parameters{$parmname} =$value;              $parameters{$parmname} =$value;
         }          }
         untie(%parmhash);          untie(%parmhash);
Removed from v.1.52  
changed lines
  Added in v.1.53

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