[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.31 and 1.35

version 1.31, 2005/05/13 20:30:14 version 1.35, 2005/08/26 20:46:46
Line 124  sub clear_package { Line 124  sub clear_package {
     undef(@Sequences);      undef(@Sequences);
     undef(%Exportrows);      undef(%Exportrows);
     undef(%res_memoize);      undef(%res_memoize);
       undef($navmap);
     &Apache::assesscalc::clear_package();      &Apache::assesscalc::clear_package();
 }  }
   
Line 457  sub put_sequence_data_in_safe_space { Line 458  sub put_sequence_data_in_safe_space {
         # 1. duplicate titles - they get the total for the titles          # 1. duplicate titles - they get the total for the titles
         # 2. control characters in titles - use q{} around the string to          # 2. control characters in titles - use q{} around the string to
         #    deal with it.            #    deal with it.  
         my $title = &HTML::Entities::decode($seq->{'title'});          my $title = &HTML::Entities::decode($seq->title());
         $title =~ s/&\#058;/:/g;          $title =~ s/&\#058;/:/g;
         if (@Rows) {          if (@Rows) {
             $data .= 'push(@{$Sequence_Rows{"'.quotemeta($title).'"}},'.              $data .= 'push(@{$Sequence_Rows{"'.quotemeta($title).'"}},'.
Line 503  END Line 504  END
 sub compute {  sub compute {
     my $self = shift;      my $self = shift;
     my ($r) = @_;      my ($r) = @_;
     my $connection = $r->connection();  
     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 ) {          ! @Sequences ) {
Line 522  sub compute { Line 521  sub compute {
     my %c = $self->constants();      my %c = $self->constants();
     foreach my $seq (@Sequences) {      foreach my $seq (@Sequences) {
         foreach my $resource (&get_resources($seq)) {          foreach my $resource (&get_resources($seq)) {
             if ($connection->aborted()) { $self->cleanup(); return; }  
             my $rownum = $self->get_row_number_from_key($resource->symb);              my $rownum = $self->get_row_number_from_key($resource->symb);
             my $cell = 'A'.$rownum;              my $cell = 'A'.$rownum;
             my $assess_filename = 'Default';              my $assess_filename = 'Default';
Line 532  sub compute { Line 530  sub compute {
                 $self->{'row_source'}->{$rownum} = $assess_filename;                  $self->{'row_source'}->{$rownum} = $assess_filename;
             }              }
             $f{$cell} = $resource->symb.'__&&&__'.$assess_filename;              $f{$cell} = $resource->symb.'__&&&__'.$assess_filename;
             if ($connection->aborted()) { $self->cleanup(); return; }  
             my $assessSheet;              my $assessSheet;
                 $assessSheet = Apache::assesscalc->new($self->{'name'},                  $assessSheet = Apache::assesscalc->new($self->{'name'},
                                                        $self->{'domain'},                                                         $self->{'domain'},
Line 546  sub compute { Line 543  sub compute {
                 $assessSheet->get_title(),$rownum,$assessSheet->calcerror()));                  $assessSheet->get_title(),$rownum,$assessSheet->calcerror()));
             }              }
             #              #
             if ($connection->aborted()) { $self->cleanup(); return; }  
             if ($assessSheet->blackout()) {              if ($assessSheet->blackout()) {
                 $self->blackout(1);                  $self->blackout(1);
                 $self->{'blackout_rows'}->{$rownum} = 1;                  $self->{'blackout_rows'}->{$rownum} = 1;
Line 589  sub compute { Line 585  sub compute {
   
 sub set_row_sources {  sub set_row_sources {
     my $self = shift;      my $self = shift;
       $self->check_formulas_loaded();
     while (my ($cell,$value) = each(%{$self->{'formulas'}})) {      while (my ($cell,$value) = each(%{$self->{'formulas'}})) {
         next if ($cell !~ /^A(\d+)$/ || $1 < 1);          next if ($cell !~ /^A(\d+)$/ || $1 < 1);
         my $row = $1;          my $row = $1;
Line 601  sub set_row_sources { Line 598  sub set_row_sources {
   
 sub set_row_numbers {  sub set_row_numbers {
     my $self = shift;      my $self = shift;
       $self->check_formulas_loaded();
     while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {      while (my ($cell,$formula) = each(%{$self->{'formulas'}})) {
         next if ($cell !~ /^A(\d+)/);          next if ($cell !~ /^A(\d+)/);
         my $row = $1;          my $row = $1;
Removed from v.1.31  
changed lines
  Added in v.1.35

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