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

matthew lon-capa-cvs@mail.lon-capa.org
Fri, 01 Aug 2003 13:33:41 -0000


matthew		Fri Aug  1 09:33:41 2003 EDT

  Modified files:              
    /loncom/interface/spreadsheet	studentcalc.pm 
  Log:
  Extra paranoia about decision to compute spreadsheet.  Removed some
  excess logging.  Please put in 1.0.
  
  
Index: loncom/interface/spreadsheet/studentcalc.pm
diff -u loncom/interface/spreadsheet/studentcalc.pm:1.15 loncom/interface/spreadsheet/studentcalc.pm:1.16
--- loncom/interface/spreadsheet/studentcalc.pm:1.15	Wed Jul 16 16:30:36 2003
+++ loncom/interface/spreadsheet/studentcalc.pm	Fri Aug  1 09:33:41 2003
@@ -1,5 +1,5 @@
 #
-# $Id: studentcalc.pm,v 1.15 2003/07/16 20:30:36 matthew Exp $
+# $Id: studentcalc.pm,v 1.16 2003/08/01 13:33:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -411,7 +411,6 @@
 
 sub compute {
     my $self = shift;
-    $self->logthis('computing');
     if (! defined($current_course) ||
         $current_course ne $ENV{'request.course.id'}) {
         $current_course = $ENV{'request.course.id'};
@@ -589,7 +588,7 @@
     my $newstore = join('___;___',
                         @{$Exportrows{$student}->{'data'}});
     $newstore = '___=___'.$newstore;
-    &Apache::lonnet::put('nohist_calculatedsheets',
+    my $result= &Apache::lonnet::put('nohist_calculatedsheets',
                          { $key     => $newstore,
                            $timekey => $Exportrows{$student}->{'time'} },
                          $self->{'cdom'},
@@ -616,7 +615,10 @@
     my $student = $self->{'name'}.':'.$self->{'domain'};
     if (! exists($Exportrows{$student}) ||
         ! defined($Exportrows{$student}) ||
+        ! exists($Exportrows{$student}->{'data'}) ||
         ! defined($Exportrows{$student}->{'data'}) ||
+        ! exists($Exportrows{$student}->{'time'}) ||
+        ! defined($Exportrows{$student}->{'time'}) ||
         ! $self->check_expiration_time($Exportrows{$student}->{'time'})) {
         $self->compute();
     }