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

Diff for /loncom/interface/spreadsheet/Spreadsheet.pm between versions 1.49 and 1.51

version 1.49, 2005/05/15 04:49:42 version 1.51, 2005/05/17 20:17:03
Line 127  sub new { Line 127  sub new {
     };      };
     #      #
     bless($self,$class);      bless($self,$class);
       $self->filename($filename);
     #      #
     return $self;      return $self;
 }  }
Line 972  sub formulas { Line 973  sub formulas {
  if (!$self->{'loaded'}) {   if (!$self->{'loaded'}) {
     $self->{'loaded'}=1;      $self->{'loaded'}=1;
     # Load in the spreadsheet definition      # Load in the spreadsheet definition
     $self->filename($filename);  
     if (exists($env{'form.workcopy'}) &&       if (exists($env{'form.workcopy'}) && 
  $self->{'type'} eq $env{'form.workcopy'}) {   $self->{'type'} eq $env{'form.workcopy'}) {
  $self->load_tmp();   $self->load_tmp();
Line 1615  sub load { Line 1615  sub load {
     my ($formulas);      my ($formulas);
     if (exists($spreadsheets{$cachekey})) {      if (exists($spreadsheets{$cachekey})) {
         $formulas = $spreadsheets{$cachekey}->{'formulas'};          $formulas = $spreadsheets{$cachekey}->{'formulas'};
     } else {   $self->formulas($formulas);
           $self->{'row_source'}=$spreadsheets{$cachekey}->{'row_source'};
           $self->{'row_numbers'}=$spreadsheets{$cachekey}->{'row_numbers'};
           $self->{'maxrow'}=$spreadsheets{$cachekey}->{'maxrow'};
      } else {
         # Not cached, need to read          # Not cached, need to read
         if (! defined($filename)) {          if (! defined($filename)) {
             $formulas = $self->load_system_default_sheet();              $formulas = $self->load_system_default_sheet();
Line 1651  sub load { Line 1655  sub load {
         $filename=$self->filename(); # filename may have changed          $filename=$self->filename(); # filename may have changed
         $cachekey = join('_',($cnum,$cdom,$stype,$filename));          $cachekey = join('_',($cnum,$cdom,$stype,$filename));
         %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};          %{$spreadsheets{$cachekey}->{'formulas'}} = %{$formulas};
    $self->formulas($formulas);
    $self->set_row_sources();
    $self->set_row_numbers();
    %{$spreadsheets{$cachekey}->{'row_source'}} = %{$self->{'row_source'}};
           %{$spreadsheets{$cachekey}->{'row_numbers'}} = %{$self->{'row_numbers'}};
           $spreadsheets{$cachekey}->{'maxrow'} = $self->{'maxrow'};
     }      }
     $self->formulas($formulas);  
     $self->set_row_sources();  
     $self->set_row_numbers();  
 }  }
   
 sub set_row_sources {  sub set_row_sources {
Removed from v.1.49  
changed lines
  Added in v.1.51

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