[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.41 and 1.42

version 1.41, 2005/05/15 02:18:12 version 1.42, 2005/05/15 02:19:49
Line 710  sub parameter_part_is_valid { Line 710  sub parameter_part_is_valid {
 sub compute {  sub compute {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      my ($r) = @_;
     my $connection = $r->connection();  
     if ($connection->aborted()) { $self->cleanup(); return; }  
     $self->initialize_safe_space();      $self->initialize_safe_space();
     #########################################      #########################################
     #########################################      #########################################
Line 739  sub compute { Line 737  sub compute {
     }      }
     #      #
     # Get the values of the metadata fields      # Get the values of the metadata fields
     if ($connection->aborted()) { $self->cleanup(); return; }  
     $self->ensure_current_caches();      $self->ensure_current_caches();
     if ($connection->aborted()) { $self->cleanup(); return; }  
     %parameters = $self->get_parameter_values(keys(%parameters));      %parameters = $self->get_parameter_values(keys(%parameters));
     if ($connection->aborted()) { $self->cleanup(); return; }  
     #      #
     # Clean out unnecessary parameters      # Clean out unnecessary parameters
     foreach (keys(%parameters)) {      foreach (keys(%parameters)) {
Line 780  sub compute { Line 775  sub compute {
             }              }
         }          }
     }      }
     if ($connection->aborted()) { $self->cleanup(); return; }  
     #      #
     # Move the parameters into the spreadsheet      # Move the parameters into the spreadsheet
     while (my ($parm,$value) = each(%parameters)) {      while (my ($parm,$value) = each(%parameters)) {
Line 794  sub compute { Line 788  sub compute {
     }      }
     $self->formulas(\%f);      $self->formulas(\%f);
     $self->constants(\%c);      $self->constants(\%c);
     if ($connection->aborted()) { $self->cleanup(); return; }  
     $self->calcsheet();      $self->calcsheet();
     #      #
     # Store export row in cache      # Store export row in cache
     my @exportarray = $self->exportrow();      my @exportarray = $self->exportrow();
     $self->deal_with_export_row(@exportarray);      $self->deal_with_export_row(@exportarray);
     $self->save() if ($self->need_to_save());      $self->save() if ($self->need_to_save());
     if ($connection->aborted()) { $self->cleanup(); return; }  
     return;      return;
 }  }
   
Line 918  spreadsheet only if necessary. Line 910  spreadsheet only if necessary.
 sub export_data {  sub export_data {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      my ($r) = @_;
     my $connection = $r->connection();  
     my $symb = $self->{'symb'};      my $symb = $self->{'symb'};
     if (! exists($env{'request.role.adv'}) || ! $env{'request.role.adv'} ||      if (! exists($env{'request.role.adv'}) || ! $env{'request.role.adv'} ||
         ! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb})  ||          ! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb})  ||
Line 929  sub export_data { Line 920  sub export_data {
         ) {          ) {
         $self->compute($r);          $self->compute($r);
     }      }
     if ($connection->aborted()) { $self->cleanup(); return; }  
     my @Data;      my @Data;
     if ($self->badcalc()) {      if ($self->badcalc()) {
         @Data = ();          @Data = ();
Removed from v.1.41  
changed lines
  Added in v.1.42

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