[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.49 and 1.51.2.1

version 1.49, 2005/05/17 18:04:40 version 1.51.2.1, 2006/05/15 23:44:46
Line 312  sub parmval { Line 312  sub parmval {
     # This should be a       # This should be a 
     if (!defined($mapname) || !defined($id) || !defined($fn)) {      if (!defined($mapname) || !defined($id) || !defined($fn)) {
  ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);   ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb);
    $mapname = &Apache::lonnet::deversion($mapname);
     }      }
     # Cascading lookup scheme      # Cascading lookup scheme
     my $rwhat=$what;      my $rwhat=$what;
Line 631  sub get_parameter_values { Line 632  sub get_parameter_values {
     if (tie(%parmhash,'GDBM_File',      if (tie(%parmhash,'GDBM_File',
             $self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {              $self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) {
  my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($self->{'symb'});   my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($self->{'symb'});
    $mapname = &Apache::lonnet::deversion($mapname);
         foreach my $parmname (@Parameters) {          foreach my $parmname (@Parameters) {
             my $value = $self->parmval($parmname,$self->{'symb'},              my $value = $self->parmval($parmname,$self->{'symb'},
        $self->{'name'},$self->{'domain'},         $self->{'name'},$self->{'domain'},
Line 703  sub parameter_part_is_valid { Line 705  sub parameter_part_is_valid {
         return 1;          return 1;
     }      }
     #      #
     my (undef,$part) =       my ($start,@pieces)=split('_',$parameter);
         ($parameter =~ m/^(resource|stores|parameter)_([^_]+)_.*/);      if ( $start !~ m/^(resource|stores|parameter)$/) { return 0; }
     if (exists($self->{'Parts'})          &&       while (@pieces) {
         exists($self->{'Parts'}->{$part}) &&          pop(@pieces);
         $self->{'Parts'}->{$part} ) {          my $testpart=join('_',@pieces);
         return 1;   if (exists($self->{'Parts'}->{$testpart}) &&
     } else {      $self->{'Parts'}->{$testpart} ) {
         return 0;      return 1;
    }
     }      }
       return 0;
 }  }
   
 sub compute {  sub compute {
Line 789  sub compute { Line 793  sub compute {
         $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);          $value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/);
         $c{$parm} = $value;          $c{$parm} = $value;
     }      }
       foreach my $cell (grep(/^A/,keys(%f))) {
           # Clean out any bad formulas
    next if (exists($c{$f{$cell}}));
    next if ($cell eq 'A0');
    delete($f{$cell});
       }
     $self->formulas(\%f);      $self->formulas(\%f);
     $self->constants(\%c);      $self->constants(\%c);
     $self->calcsheet();      $self->calcsheet();
Removed from v.1.49  
changed lines
  Added in v.1.51.2.1

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