--- loncom/interface/spreadsheet/studentcalc.pm 2003/09/05 01:06:45 1.17
+++ loncom/interface/spreadsheet/studentcalc.pm 2003/09/12 19:00:54 1.20
@@ -1,5 +1,5 @@
#
-# $Id: studentcalc.pm,v 1.17 2003/09/05 01:06:45 matthew Exp $
+# $Id: studentcalc.pm,v 1.20 2003/09/12 19:00:54 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -103,6 +103,7 @@ sub initialize_sequence_cache {
sub clear_package {
undef(@Sequences);
undef(%Exportrows);
+ &Apache::assesscalc::clear_package();
}
sub get_title {
@@ -128,7 +129,7 @@ sub get_html_title {
my $title = '
'.$name;
if ($ENV{'user.name'} ne $self->{'name'} &&
$ENV{'user.domain'} ne $self->{'domain'}) {
- $title .= &Apache::loncommon::aboutmewrapper
+ $title .= ' '.&Apache::loncommon::aboutmewrapper
($self->{'name'}.'@'.$self->{'domain'},
$self->{'name'},$self->{'domain'});
}
@@ -414,6 +415,9 @@ sub outsheet_recursive_excel {
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'}) {
$current_course = $ENV{'request.course.id'};
@@ -440,6 +444,7 @@ sub compute {
foreach my $seq (@sequences) {
next if ($seq->{'num_assess'}<1);
foreach my $resource (@{$seq->{'contents'}}) {
+ if ($connection->aborted()) { $self->cleanup(); return; }
next if ($resource->{'type'} ne 'assessment');
my $rownum = $self->get_row_number_from_key($resource->{'symb'});
my $cell = 'A'.$rownum;
@@ -450,11 +455,13 @@ sub compute {
$self->{'row_source'}->{$rownum} = $assess_filename;
}
$f{$cell} = $resource->{'symb'}.'__&&&__'.$assess_filename;
+ if ($connection->aborted()) { $self->cleanup(); return; }
my $assessSheet = Apache::assesscalc->new($self->{'name'},
$self->{'domain'},
$assess_filename,
$resource->{'symb'});
- my @exportdata = $assessSheet->export_data();
+ my @exportdata = $assessSheet->export_data($r);
+ if ($connection->aborted()) { $self->cleanup(); return; }
if ($assessSheet->blackout()) {
$self->blackout(1);
$self->{'blackout_rows'}->{$rownum} = 1;
@@ -582,6 +589,8 @@ Writes the export data for this student
#############################################
sub save_export_data {
my $self = shift;
+ &Apache::assesscalc::save_cached_export_rows($self->{'name'},
+ $self->{'domain'});
return if ($self->temporary());
my $student = $self->{'name'}.':'.$self->{'domain'};
return if (! exists($Exportrows{$student}));
@@ -615,6 +624,8 @@ spreadsheet only if necessary.
#############################################
sub export_data {
my $self = shift;
+ my ($r) = @_;
+ my $connection = $r->connection();
my $student = $self->{'name'}.':'.$self->{'domain'};
if (! exists($Exportrows{$student}) ||
! defined($Exportrows{$student}) ||
@@ -623,8 +634,9 @@ sub export_data {
! exists($Exportrows{$student}->{'time'}) ||
! defined($Exportrows{$student}->{'time'}) ||
! $self->check_expiration_time($Exportrows{$student}->{'time'})) {
- $self->compute();
+ $self->compute($r);
}
+ if ($connection->aborted()) { $self->cleanup(); return; }
my @Data = @{$Exportrows{$student}->{'data'}};
for (my $i=0; $i<=$#Data;$i++) {
$Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i]));