[LON-CAPA-cvs] cvs: loncom /interface/spreadsheet studentcalc.pm

albertel lon-capa-cvs@mail.lon-capa.org
Sun, 15 May 2005 03:06:59 -0000


albertel		Sat May 14 23:06:59 2005 EDT

  Modified files:              
    /loncom/interface/spreadsheet	studentcalc.pm 
  Log:
  - remving superflouous connection abort checks
  
  
Index: loncom/interface/spreadsheet/studentcalc.pm
diff -u loncom/interface/spreadsheet/studentcalc.pm:1.31 loncom/interface/spreadsheet/studentcalc.pm:1.32
--- loncom/interface/spreadsheet/studentcalc.pm:1.31	Fri May 13 16:30:14 2005
+++ loncom/interface/spreadsheet/studentcalc.pm	Sat May 14 23:06:59 2005
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.31 2005/05/13 20:30:14 albertel Exp $
+# $Id: studentcalc.pm,v 1.32 2005/05/15 03:06:59 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -503,8 +503,6 @@
 sub compute {
     my $self = shift;
     my ($r) = @_;
-    my $connection = $r->connection();
-    if ($connection->aborted()) { $self->cleanup; return; }
     if (! defined($current_course) ||
         $current_course ne $env{'request.course.id'} ||
         ! @Sequences ) {
@@ -522,7 +520,6 @@
     my %c = $self->constants();
     foreach my $seq (@Sequences) {
         foreach my $resource (&get_resources($seq)) {
-            if ($connection->aborted()) { $self->cleanup(); return; }
             my $rownum = $self->get_row_number_from_key($resource->symb);
             my $cell = 'A'.$rownum;
             my $assess_filename = 'Default';
@@ -532,7 +529,6 @@
                 $self->{'row_source'}->{$rownum} = $assess_filename;
             }
             $f{$cell} = $resource->symb.'__&&&__'.$assess_filename;
-            if ($connection->aborted()) { $self->cleanup(); return; }
             my $assessSheet;
                 $assessSheet = Apache::assesscalc->new($self->{'name'},
                                                        $self->{'domain'},
@@ -546,7 +542,6 @@
                 $assessSheet->get_title(),$rownum,$assessSheet->calcerror()));
             }
             #
-            if ($connection->aborted()) { $self->cleanup(); return; }
             if ($assessSheet->blackout()) {
                 $self->blackout(1);
                 $self->{'blackout_rows'}->{$rownum} = 1;