Diff for /loncom/interface/spreadsheet/Spreadsheet.pm between versions 1.57 and 1.61

version 1.57, 2005/10/12 21:48:32 version 1.61, 2006/01/10 16:38:47
Line 378  Calls the system EXT function to determi Line 378  Calls the system EXT function to determi
   
 #-------------------------------------------------------  #-------------------------------------------------------
 sub EXT {  sub EXT {
     my ($parameter) = @_;      my ($parameter,$specific_symb) = @_;
     return '' if (! defined($parameter) || $parameter eq '');      return '' if (! defined($parameter) || $parameter eq '');
     $parameter =~ s/^parameter\./resource\./;      $parameter =~ s/^parameter\./resource\./;
     my $value = &Apache::lonnet::EXT($parameter,$symb,$domain,$name,$usection);      if ($specific_symb eq '') { $specific_symb = $symb; }
       my $value = &Apache::lonnet::EXT($parameter,$specific_symb,$domain,$name,
        $usection);
     return $value;      return $value;
 }  }
   
Line 697  sub get_values { Line 699  sub get_values {
  }   }
  return \@values;   return \@values;
     } else {      } else {
  $num = '(\d+)';   $num = '([1-9]\d*)';
     }      }
     if (($la eq '*') || ($ua eq '*')) {      if (($la eq '*') || ($ua eq '*')) {
         $alpha='[A-z]';          $alpha='[A-z]';
Line 1665  sub load { Line 1667  sub load {
   
 sub cache_sheet {  sub cache_sheet {
     my $self = shift;      my $self = shift;
     my $formulas=(@_);      my ($formulas) = @_;
     my $stype = $self->{'type'};      my $stype = $self->{'type'};
     my $cnum  = $self->{'cnum'};      my $cnum  = $self->{'cnum'};
     my $cdom  = $self->{'cdom'};      my $cdom  = $self->{'cdom'};
Line 1673  sub cache_sheet { Line 1675  sub cache_sheet {
     my $filename = $self->filename();      my $filename = $self->filename();
     my $cachekey = join('_',($cnum,$cdom,$stype,$filename));      my $cachekey = join('_',($cnum,$cdom,$stype,$filename));
   
     if (ref($self->{'formulas'}) eq 'HASH') {      if (ref($formulas) eq 'HASH') {
  %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};   %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};
     }      }
     if (ref($self->{'row_source'})) {      if (ref($self->{'row_source'})) {

Removed from v.1.57  
changed lines
  Added in v.1.61


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