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

Diff for /loncom/interface/spreadsheet/studentcalc.pm between versions 1.21 and 1.22

version 1.21, 2003/09/16 15:39:36 version 1.22, 2003/09/18 20:12:40
Line 57  use Apache::lonnavmaps; Line 57  use Apache::lonnavmaps;
 use Apache::Spreadsheet();  use Apache::Spreadsheet();
 use Apache::assesscalc();  use Apache::assesscalc();
 use HTML::Entities();  use HTML::Entities();
 use Spreadsheet::WriteExcel;  
 use Time::HiRes;  use Time::HiRes;
   
 @Apache::studentcalc::ISA = ('Apache::Spreadsheet');  @Apache::studentcalc::ISA = ('Apache::Spreadsheet');
Line 89  sub ensure_correct_sequence_data { Line 88  sub ensure_correct_sequence_data {
 sub initialize_sequence_cache {  sub initialize_sequence_cache {
     #      #
     # Set up the sequences and assessments      # Set up the sequences and assessments
     @Sequences = ();      undef(@Sequences);
     my ($top,$sequences,$assessments) =       my ($top,$sequences,$assessments) = 
         &Apache::loncoursedata::get_sequence_assessment_data();          &Apache::loncoursedata::get_sequence_assessment_data();
     if (! defined($top) || ! ref($top)) {      if (! defined($top) || ! ref($top)) {
Line 409  sub outsheet_recursive_excel { Line 408  sub outsheet_recursive_excel {
     my ($r) = @_;      my ($r) = @_;
 }   } 
   
   ##
   ## Routines to deal with sequences in the safe space
   ##
   sub get_rows_in_sequence {
       my $self = shift();
       my ($sequence) = @_;
       my @Rows;
       foreach my $resource (@{$sequence->{'contents'}}) {
           if ($resource->{'type'} eq 'assessment') {
               my $rownum = $self->get_row_number_from_key($resource->{'symb'});
               push (@Rows,$rownum);
           }
       }
       return @Rows;
   }
   
   sub remove_sequence_data_from_safe_space {
       my $self = shift();
       my $command = 'undef(%Sequence_Rows);';
       $self->{'safe'}->reval($command);
   }
   
   sub put_sequence_data_in_safe_space {
       my $self = shift();
       my $data = 'undef(%Sequence_Rows);';
       # Build up the %Sequence_Rows hash - each sequence title is associated with
       # an array pointer, which holds the rows in the sequence.
       foreach my $seq (@Sequences) {
           my @Rows = $self->get_rows_in_sequence($seq);
           # 
           # Potential problems with sequence titles:
           # 1. duplicate titles - they get the total for the titles
           # 2. control characters in titles - use q{} around the string to
           #    deal with it.  
           my $title = &HTML::Entities::decode($seq->{'title'});
           $title =~ s/&\#058;/:/g;
           if (@Rows) {
               $data .= 'push(@{$Sequence_Rows{"'.quotemeta($title).'"}},'.
                   '('.join(',',@Rows).'));'."\n";;
           }
       }
       my $new_code = $data.<<'END';
   sub SUMSEQ {
       my ($col,@titles) = @_;
       return 'bad column: '.$col if ($col !~ /^[A-z]$/);
       my $sum = 0;
       foreach my $title (@titles) {
           while (my ($seq_title,$rows) = each(%Sequence_Rows)) {
               my $regexp;
               if ($title =~ /^regexp:(.*)$/) {
                   $regexp = $1;
               } elsif (lc($title) eq 'all') {
                   $regexp = '.';
               }
               if (defined($regexp)) {
                   next if ($seq_title !~ /$regexp/);
               } else {
                   next if ($seq_title ne $title);
               }
               foreach my $rownum (@{$rows}) {
                   my $cell = $col.$rownum;
                   if (exists($sheet_values{$cell})) {
                       $sum += $sheet_values{$cell};
                   }
               }
           }
       }
       return $sum;
   }
   END
       $self->{'safe'}->reval($new_code);
       return;
   }
   
   ##
   ## Main computation method
   ##
 sub compute {  sub compute {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      my ($r) = @_;
     my $connection = $r->connection();      my $connection = $r->connection();
     if ($connection->aborted()) { $self->cleanup; return; }      if ($connection->aborted()) { $self->cleanup; return; }
     if (! defined($current_course) ||      if (! defined($current_course) ||
         $current_course ne $ENV{'request.course.id'}) {          $current_course ne $ENV{'request.course.id'} ||
           ! @Sequences ) {
         $current_course = $ENV{'request.course.id'};          $current_course = $ENV{'request.course.id'};
         &clear_package();          &clear_package();
         &initialize_sequence_cache();          &initialize_sequence_cache();
     }      }
     $self->initialize_safe_space();      $self->initialize_safe_space();
     my @sequences = @Sequences;  
     if (@sequences < 1) {  
         my ($top,$sequences,$assessments) =   
             &Apache::loncoursedata::get_sequence_assessment_data();  
         if (! defined($top) || ! ref($top)) {  
             &Apache::lonnet::logthis('top is undefined');  
             return;  
         }  
         @sequences = @{$sequences} if (ref($sequences) eq 'ARRAY');  
     }  
     &Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'});      &Apache::assesscalc::initialize_package($self->{'name'},$self->{'domain'});
     my %f = $self->formulas();      my %f = $self->formulas();
     #      #
     # Process the formulas list -       # Process the formulas list - 
     #   the formula for the A column of a row is symb__&&__filename      #   the formula for the A column of a row is symb__&&__filename
     my %c = $self->constants();      my %c = $self->constants();
     foreach my $seq (@sequences) {      foreach my $seq (@Sequences) {
         next if ($seq->{'num_assess'}<1);          next if ($seq->{'num_assess'}<1);
         foreach my $resource (@{$seq->{'contents'}}) {          foreach my $resource (@{$seq->{'contents'}}) {
             if ($connection->aborted()) { $self->cleanup(); return; }              if ($connection->aborted()) { $self->cleanup(); return; }
Line 482  sub compute { Line 549  sub compute {
     }      }
     $self->constants(\%c);      $self->constants(\%c);
     $self->formulas(\%f);      $self->formulas(\%f);
       $self->put_sequence_data_in_safe_space();
     $self->calcsheet();      $self->calcsheet();
       $self->remove_sequence_data_from_safe_space();
     #      #
     # Store export row in cache      # Store export row in cache
     my @exportarray=$self->exportrow();      my @exportarray=$self->exportrow();
Removed from v.1.21  
changed lines
  Added in v.1.22

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