version 1.20, 2003/09/09 18:46:28
|
version 1.31, 2004/02/03 22:19:47
|
Line 50 use Apache::Constants qw(:common :http);
|
Line 50 use Apache::Constants qw(:common :http);
|
use Apache::lonnet; |
use Apache::lonnet; |
use Apache::loncommon; |
use Apache::loncommon; |
use Apache::Spreadsheet; |
use Apache::Spreadsheet; |
|
use Apache::loncoursedata(); |
use HTML::Entities(); |
use HTML::Entities(); |
use Spreadsheet::WriteExcel; |
use Spreadsheet::WriteExcel; |
use GDBM_File; |
use GDBM_File; |
use Time::HiRes; |
use Time::HiRes; |
|
use Apache::lonlocal; |
|
|
@Apache::assesscalc::ISA = ('Apache::Spreadsheet'); |
@Apache::assesscalc::ISA = ('Apache::Spreadsheet'); |
|
|
Line 90 use Time::HiRes;
|
Line 92 use Time::HiRes;
|
######################################################## |
######################################################## |
|
|
my %Exportrows; |
my %Exportrows; |
|
my %newExportrows; |
|
|
my $current_name; |
my $current_name; |
my $current_domain; |
my $current_domain; |
Line 99 my %parmhash;
|
Line 102 my %parmhash;
|
my %nice_parameter_name; |
my %nice_parameter_name; |
|
|
my %useropt; |
my %useropt; |
|
my %userdata; |
my %courseopt; |
my %courseopt; |
|
|
######################################################## |
######################################################## |
Line 110 my %courseopt;
|
Line 114 my %courseopt;
|
|
|
=item &clear_package() |
=item &clear_package() |
|
|
Reset all package variables. |
Reset all package variables and clean up caches. |
|
|
=cut |
=cut |
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
sub clear_package { |
sub clear_package { |
|
if (defined($current_name) && |
|
defined($current_domain) && |
|
defined($current_course) && |
|
$current_course eq $ENV{'request.course.id'} && |
|
%newExportrows) { |
|
&save_cached_export_rows($current_name,$current_domain); |
|
} |
undef(%Exportrows); |
undef(%Exportrows); |
|
undef(%newExportrows); |
undef($current_name); |
undef($current_name); |
undef($current_domain); |
undef($current_domain); |
undef($current_course); |
undef($current_course); |
undef(%useropt); |
undef(%useropt); |
|
undef(%userdata); |
undef(%courseopt); |
undef(%courseopt); |
} |
} |
|
|
|
sub save_cached_export_rows { |
|
my ($sname,$sdomain) = @_; |
|
my $start = Time::HiRes::time; |
|
my $result = &Apache::lonnet::put |
|
('nohist_calculatedsheets_'.$ENV{'request.course.id'}, |
|
$newExportrows{$sname.':'.$sdomain}, |
|
$sdomain,$sname); |
|
delete($newExportrows{$sname.':'.$sdomain}); |
|
} |
|
|
sub initialize { |
sub initialize { |
&clear_package(); |
&clear_package(); |
|
&Apache::loncoursedata::clear_internal_caches(); |
} |
} |
|
|
######################################################## |
######################################################## |
Line 144 sub initialize_package {
|
Line 168 sub initialize_package {
|
my ($sname,$sdomain) = @_; |
my ($sname,$sdomain) = @_; |
$current_name = $sname; |
$current_name = $sname; |
$current_domain = $sdomain; |
$current_domain = $sdomain; |
|
undef(%useropt); |
|
undef(%userdata); |
if ($current_course ne $ENV{'request.course.id'}) { |
if ($current_course ne $ENV{'request.course.id'}) { |
$current_course = $ENV{'request.course.id'}; |
$current_course = $ENV{'request.course.id'}; |
undef(%courseopt); |
undef(%courseopt); |
} |
} |
&load_cached_export_rows(); |
&load_cached_export_rows(); |
&load_parameter_caches(); |
&load_parameter_caches(); |
|
&Apache::loncoursedata::clear_internal_caches(); |
} |
} |
|
|
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
|
|
Line 172 sub load_parameter_caches {
|
Line 200 sub load_parameter_caches {
|
$current_course = $ENV{'request.course.id'}; |
$current_course = $ENV{'request.course.id'}; |
undef(%courseopt); |
undef(%courseopt); |
if (! defined($current_name) || ! defined($current_domain)) { |
if (! defined($current_name) || ! defined($current_domain)) { |
&Apache::lonnet::logthis('bad call to setup_parameter_caches'); |
|
return; |
return; |
} |
} |
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
Line 192 sub load_parameter_caches {
|
Line 219 sub load_parameter_caches {
|
} |
} |
$useropt{$userprefix.$name}=$value; |
$useropt{$userprefix.$name}=$value; |
} |
} |
|
$useropt{'loadtime'} = time; |
} |
} |
|
if (! %userdata) { |
|
%userdata = &Apache::loncoursedata::get_current_state($current_name, |
|
$current_domain); |
|
$userdata{'loadtime'} = time; |
|
} |
|
return; |
} |
} |
|
|
######################################################## |
######################################################## |
Line 206 sub load_parameter_caches {
|
Line 240 sub load_parameter_caches {
|
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
sub ensure_current_parameter_caches { |
sub ensure_current_caches { |
my $self = shift; |
my $self = shift; |
## |
## |
## Check for a modified parameters |
## Check for a modified parameters |
Line 215 sub ensure_current_parameter_caches {
|
Line 249 sub ensure_current_parameter_caches {
|
$current_course ne $ENV{'request.course.id'} ) { |
$current_course ne $ENV{'request.course.id'} ) { |
$current_course = $ENV{'request.course.id'}; |
$current_course = $ENV{'request.course.id'}; |
undef(%courseopt); |
undef(%courseopt); |
|
undef(%useropt); |
|
undef(%userdata); |
} |
} |
## |
## |
## Check for new user |
## Check for new user |
Line 224 sub ensure_current_parameter_caches {
|
Line 260 sub ensure_current_parameter_caches {
|
$current_domain = $self->{'domain'}; |
$current_domain = $self->{'domain'}; |
$current_name = $self->{'name'}; |
$current_name = $self->{'name'}; |
undef(%useropt); |
undef(%useropt); |
|
undef(%userdata); |
} |
} |
&load_parameter_caches(); |
&load_parameter_caches(); |
} |
} |
Line 331 sub parmval {
|
Line 368 sub parmval {
|
|
|
sub get_html_title { |
sub get_html_title { |
my $self = shift; |
my $self = shift; |
my ($assess_title,$name,$time) = $self->get_title(); |
my ($assess_title,$name,$time) = $self->get_full_title(); |
my $title = '<h1>'.$assess_title.'</h1>'. |
my $title = '<h1>'.$assess_title.'</h1>'. |
'<h2>'.$name.', '. |
'<h2>'.$name.', '. |
&Apache::loncommon::aboutmewrapper |
&Apache::loncommon::aboutmewrapper |
Line 343 sub get_html_title {
|
Line 380 sub get_html_title {
|
|
|
sub get_title { |
sub get_title { |
my $self = shift; |
my $self = shift; |
my @title = (); |
|
if (($self->{'symb'} eq '_feedback') || |
if (($self->{'symb'} eq '_feedback') || |
($self->{'symb'} eq '_evaluation') || |
($self->{'symb'} eq '_evaluation') || |
($self->{'symb'} eq '_discussion') || |
($self->{'symb'} eq '_discussion') || |
($self->{'symb'} eq '_tutoring')) { |
($self->{'symb'} eq '_tutoring')) { |
my $assess_title = ucfirst($self->{'symb'}); |
my $assess_title = ucfirst($self->{'symb'}); |
$assess_title =~ s/^_//; |
$assess_title =~ s/^_//; |
push(@title,$assess_title); |
return $assess_title; |
} else { |
} else { |
push(@title,&Apache::lonnet::gettitle($self->{'symb'})); |
return &Apache::lonnet::gettitle($self->{'symb'}); |
} |
} |
|
} |
|
|
|
sub get_full_title { |
|
my $self = shift; |
|
my @title = ($self->get_title()); |
# Look up the users identifying information |
# Look up the users identifying information |
# Get the users information |
# Get the users information |
my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'}, |
my %userenv = &Apache::loncoursedata::GetUserName($self->{'name'}, |
Line 362 sub get_title {
|
Line 403 sub get_title {
|
join(' ',@userenv{'firstname','middlename','lastname','generation'}); |
join(' ',@userenv{'firstname','middlename','lastname','generation'}); |
$name =~ s/\s+$//; |
$name =~ s/\s+$//; |
push (@title,$name); |
push (@title,$name); |
push (@title,scalar(localtime(time))); |
push (@title,&Apache::lonlocal::locallocaltime(time)); |
return @title; |
return @title; |
} |
} |
|
|
Line 371 sub parent_link {
|
Line 412 sub parent_link {
|
my $link .= '<p><a href="/adm/studentcalc?'. |
my $link .= '<p><a href="/adm/studentcalc?'. |
'sname='.$self->{'name'}. |
'sname='.$self->{'name'}. |
'&sdomain='.$self->{'domain'}.'">'. |
'&sdomain='.$self->{'domain'}.'">'. |
'Student level sheet</a></p>'."\n"; |
&mt('Student level sheet').'</a></p>'."\n"; |
return $link; |
return $link; |
} |
} |
|
|
sub outsheet_html { |
sub outsheet_html { |
my $self = shift; |
my $self = shift; |
my ($r) = @_; |
my ($r) = @_; |
|
#################################### |
|
# Report any calculation errors # |
|
#################################### |
|
$r->print($self->html_report_error()); |
################################### |
################################### |
# Determine table structure |
# Determine table structure |
################################### |
################################### |
Line 385 sub outsheet_html {
|
Line 430 sub outsheet_html {
|
my $exportcolor = '#FFFFAA'; |
my $exportcolor = '#FFFFAA'; |
my $num_uneditable = 1; |
my $num_uneditable = 1; |
my $num_left = 52-$num_uneditable; |
my $num_left = 52-$num_uneditable; |
|
my %lt=&Apache::lonlocal::texthash( |
|
'as' => 'Assessment', |
|
'ca' => 'Calculations', |
|
); |
my $tableheader =<<"END"; |
my $tableheader =<<"END"; |
<table border="2"> |
<table border="2"> |
<tr> |
<tr> |
<th colspan="2" rowspan="2"><font size="+2">Assessment</font></th> |
<th colspan="2" rowspan="2"><font size="+2">$lt{'as'}</font></th> |
<td bgcolor="$importcolor" colspan="$num_uneditable"> </td> |
<td bgcolor="$importcolor" colspan="$num_uneditable"> </td> |
<td colspan="$num_left"> |
<td colspan="$num_left"> |
<b><font size="+1">Calculations</font></b></td> |
<b><font size="+1">$lt{'ca'}</font></b></td> |
</tr><tr> |
</tr><tr> |
END |
END |
my $label_num = 0; |
my $label_num = 0; |
Line 433 END
|
Line 482 END
|
# |
# |
my $num_output = 0; |
my $num_output = 0; |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
|
if (! $self->parameter_part_is_valid( |
|
$self->{'formulas'}->{'A'.$rownum} |
|
)) { |
|
next; |
|
} |
if ($num_output++ % 50 == 0) { |
if ($num_output++ % 50 == 0) { |
$r->print("</table>\n".$tableheader); |
$r->print("</table>\n".$tableheader); |
} |
} |
Line 477 sub csv_rows {
|
Line 531 sub csv_rows {
|
# writes the meat of the spreadsheet to an excel worksheet. Called |
# writes the meat of the spreadsheet to an excel worksheet. Called |
# by Spreadsheet::outsheet_excel; |
# by Spreadsheet::outsheet_excel; |
my $self = shift; |
my $self = shift; |
my ($filehandle) = @_; |
my ($connection,$filehandle) = @_; |
# |
# |
# Write a header row |
# Write a header row |
$self->csv_output_row($filehandle,undef, |
$self->csv_output_row($filehandle,undef, |
('Parameter','Description','Value')); |
(&mt('Parameter'),&mt('Description'),&mt('Value'))); |
# |
# |
# Write each row |
# Write each row |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
Line 500 sub excel_rows {
|
Line 554 sub excel_rows {
|
# writes the meat of the spreadsheet to an excel worksheet. Called |
# writes the meat of the spreadsheet to an excel worksheet. Called |
# by Spreadsheet::outsheet_excel; |
# by Spreadsheet::outsheet_excel; |
my $self = shift; |
my $self = shift; |
my ($worksheet,$cols_output,$rows_output) = @_; |
my ($connection,$worksheet,$cols_output,$rows_output) = @_; |
|
return if (! ref($worksheet)); |
# |
# |
# Write a header row |
# Write a header row |
$cols_output = 0; |
$cols_output = 0; |
Line 522 sub excel_rows {
|
Line 577 sub excel_rows {
|
return; |
return; |
} |
} |
|
|
|
## |
|
## Routines to support assesscalc::compute |
|
## |
|
sub get_parm_names { |
|
my $self = shift; |
|
my @Mandatory_parameters = @_; |
|
my %parameters_and_names; |
|
# |
|
my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'}); |
|
my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); |
|
foreach my $parm (@Mandatory_parameters,@Metadata) { |
|
next if ($parm !~ /^(resource\.|stores|parameter)_/); |
|
my $cleaned_name = $parm; |
|
$cleaned_name =~ s/^resource\./stores_/; |
|
$cleaned_name =~ s/\./_/g; |
|
my $display = &Apache::lonnet::metadata($srcf, |
|
$cleaned_name.'.display'); |
|
if (! $display) { |
|
$display .= &Apache::lonnet::metadata($srcf,$cleaned_name.'.name'); |
|
} |
|
$parameters_and_names{$cleaned_name}=$display; |
|
} |
|
return (%parameters_and_names); |
|
} |
|
|
|
sub get_parameter_values { |
|
my $self = shift(); |
|
my @Parameters; |
|
my ($parameters) = @_; |
|
if (!ref($parameters)) { |
|
@Parameters = @_; |
|
} elsif (ref($parameters) eq 'ARRAY') { |
|
@Parameters = @$parameters; |
|
} elsif (ref($parameters) eq 'HASH') { |
|
@Parameters = keys(%$parameters); |
|
} |
|
# |
|
my %parameters; |
|
# |
|
my $filename = $self->{'coursefilename'}.'_parms.db'; |
|
if (tie(%parmhash,'GDBM_File', |
|
$self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
|
foreach my $parmname (@Parameters) { |
|
my $value = $self->parmval($parmname); |
|
$parameters{$parmname} =$value; |
|
} |
|
untie(%parmhash); |
|
} else { |
|
$self->logthis('unable to tie '.$filename); |
|
} |
|
return %parameters; |
|
} |
|
|
|
sub deal_with_export_row { |
|
my $self = shift(); |
|
my @exportarray = @_; |
|
$Exportrows{$self->{'symb'}}->{'time'} = time; |
|
$Exportrows{$self->{'symb'}}->{$self->{'filename'}} = \@exportarray; |
|
# |
|
# Save the export data |
|
$self->save_export_data(); |
|
return; |
|
} |
|
|
|
sub get_problem_state { |
|
my $self = shift; |
|
my %student_parameters; |
|
if (exists($userdata{$self->{'symb'}}) && |
|
ref($userdata{$self->{'symb'}}) eq 'HASH') { |
|
%student_parameters = %{$userdata{$self->{'symb'}}}; |
|
} |
|
return %student_parameters; |
|
} |
|
|
|
sub determine_parts { |
|
my $self = shift; |
|
if (exists($self->{'Parts'}) && ref($self->{'Parts'}) eq 'HASH') { |
|
return; |
|
} |
|
my (undef,undef,$url) = &Apache::lonnet::decode_symb($self->{'symb'}); |
|
my $src = &Apache::lonnet::clutter($url); |
|
return if (! defined($src)); |
|
my %Parts; |
|
my $metadata = &Apache::lonnet::metadata($src,'packages'); |
|
foreach (split(',',$metadata)) { |
|
my ($part) = (/^part_(.*)$/); |
|
if (defined($part) && |
|
! &Apache::loncommon::check_if_partid_hidden |
|
($part,$self->{'symb'},$self->{'name'},$self->{'domain'}) |
|
) { |
|
$Parts{$part}++; |
|
} |
|
} |
|
# Make sure part 0 is defined. |
|
$Parts{'0'}++; |
|
$self->{'Parts'} = \%Parts; |
|
return; |
|
} |
|
|
|
sub parameter_part_is_valid { |
|
my $self = shift; |
|
my ($parameter) = @_; |
|
return 1 if ($parameter eq 'timestamp'); |
|
if (! defined($self->{'Parts'}) || |
|
! ref ($self->{'Parts'}) || |
|
ref($self->{'Parts'}) ne 'HASH') { |
|
return 1; |
|
} |
|
# |
|
my (undef,$part) = |
|
($parameter =~ m/^(resource|stores|parameter)_([^_]+)_.*/); |
|
if (exists($self->{'Parts'}) && |
|
exists($self->{'Parts'}->{$part}) && |
|
$self->{'Parts'}->{$part} ) { |
|
return 1; |
|
} else { |
|
return 0; |
|
} |
|
} |
|
|
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; } |
# $self->logthis('computing'); |
|
$self->initialize_safe_space(); |
$self->initialize_safe_space(); |
######################################### |
######################################### |
######################################### |
######################################### |
Line 548 sub compute {
|
Line 722 sub compute {
|
my %parameters; # holds underscored parameters by name |
my %parameters; # holds underscored parameters by name |
# |
# |
# Get the metadata fields and determine their proper names |
# Get the metadata fields and determine their proper names |
my ($symap,$syid,$srcf)=&Apache::lonnet::decode_symb($self->{'symb'}); |
my %nice_parm_names = $self->get_parm_names(@Mandatory_parameters); |
my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); |
while (my($cleaned_name,$display) = each(%nice_parm_names)) { |
foreach my $parm (@Mandatory_parameters,@Metadata) { |
|
next if ($parm !~ /^(resource\.|stores|parameter)_/); |
|
my $cleaned_name = $parm; |
|
$cleaned_name =~ s/^resource\./stores_/; |
|
$cleaned_name =~ s/\./_/g; |
|
my $display = &Apache::lonnet::metadata($srcf, |
|
$cleaned_name.'.display'); |
|
if (! $display) { |
|
$display .= &Apache::lonnet::metadata($srcf,$cleaned_name.'.name'); |
|
} |
|
$parameters{$cleaned_name}++; |
$parameters{$cleaned_name}++; |
$nice_parameter_name{$cleaned_name} = $display; |
$nice_parameter_name{$cleaned_name} = $display; |
} |
} |
# |
# |
# Get the values of the metadata fields |
# Get the values of the metadata fields |
if ($connection->aborted()) { $self->cleanup(); return; } |
if ($connection->aborted()) { $self->cleanup(); return; } |
$self->ensure_current_parameter_caches(); |
$self->ensure_current_caches(); |
if ($connection->aborted()) { $self->cleanup(); return; } |
if ($connection->aborted()) { $self->cleanup(); return; } |
my $filename = $self->{'coursefilename'}.'_parms.db'; |
%parameters = $self->get_parameter_values(keys(%parameters)); |
if (tie(%parmhash,'GDBM_File', |
|
$self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
|
foreach my $parmname (keys(%parameters)) { |
|
my $value = $self->parmval($parmname); |
|
$parameters{$parmname} =$value; |
|
} |
|
untie(%parmhash); |
|
} else { |
|
$self->logthis('unable to tie '.$filename); |
|
} |
|
if ($connection->aborted()) { $self->cleanup(); return; } |
if ($connection->aborted()) { $self->cleanup(); return; } |
# |
# |
# Clean out unnecessary parameters |
# Clean out unnecessary parameters |
Line 587 sub compute {
|
Line 741 sub compute {
|
} |
} |
# |
# |
# Get the students performance data |
# Get the students performance data |
my %student_parameters = |
my %student_parameters = $self->get_problem_state(); |
&Apache::loncoursedata::get_current_state($self->{'name'}, |
|
$self->{'domain'}, |
|
$self->{'symb'}, |
|
$self->{'cid'}); |
|
while (my ($parm,$value) = each(%student_parameters)) { |
while (my ($parm,$value) = each(%student_parameters)) { |
$parm =~ s/^resource\./stores_/; |
$parm =~ s/^resource\./stores_/; |
$parm =~ s/\./_/g; |
$parm =~ s/\./_/g; |
$parameters{$parm} = $value; |
$parameters{$parm} = $value; |
} |
} |
# |
# |
|
# Clean out any bad parameters |
|
$self->determine_parts(); |
|
foreach my $param (keys(%parameters)) { |
|
if (! $self->parameter_part_is_valid($param)) { |
|
delete ($parameters{$param}); |
|
} |
|
} |
|
# |
# Set up the formulas and parameter values |
# Set up the formulas and parameter values |
my %f=$self->formulas(); |
my %f=$self->formulas(); |
my %c; |
my %c; |
Line 607 sub compute {
|
Line 765 sub compute {
|
while (my ($parm,$value) = each(%parameters)) { |
while (my ($parm,$value) = each(%parameters)) { |
last if ($self->blackout()); |
last if ($self->blackout()); |
next if ($parm !~ /^(parameter_.*)_problemstatus$/); |
next if ($parm !~ /^(parameter_.*)_problemstatus$/); |
next if ($parameters{$1.'_answerdate'}<time); |
if ($parameters{$1.'_answerdate'} ne '' && |
|
$parameters{$1.'_answerdate'} < time) { |
|
next; |
|
} |
if (lc($value) eq 'no') { |
if (lc($value) eq 'no') { |
# We must blackout this sheet |
# We must blackout this sheet |
$self->blackout(1); |
$self->blackout(1); |
Line 617 sub compute {
|
Line 778 sub compute {
|
if ($connection->aborted()) { $self->cleanup(); return; } |
if ($connection->aborted()) { $self->cleanup(); return; } |
# |
# |
# Move the parameters into the spreadsheet |
# Move the parameters into the spreadsheet |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
while (my ($parm,$value) = each(%parameters)) { |
while (my ($parm,$value) = each(%parameters)) { |
my $cell = 'A'.$self->get_row_number_from_key($parm); |
my $cell = 'A'.$self->get_row_number_from_key($parm); |
$f{$cell} = $parm; |
$f{$cell} = $parm; |
$value = '"'.$value.'"' if ($value =~/[^0-9.]/); |
if ($parm =~ /_submission$/ && $value =~ /(\{|\})/) { |
|
$value = 'witheld'; |
|
} |
|
$value = 'q{'.$value.'}' if ($value !~/^\s*\d+(\.\d+)?\s*$/); |
$c{$parm} = $value; |
$c{$parm} = $value; |
} |
} |
$self->formulas(\%f); |
$self->formulas(\%f); |
Line 631 sub compute {
|
Line 794 sub compute {
|
# |
# |
# Store export row in cache |
# Store export row in cache |
my @exportarray = $self->exportrow(); |
my @exportarray = $self->exportrow(); |
$Exportrows{$self->{'symb'}}->{'time'} = time; |
$self->deal_with_export_row(@exportarray); |
$Exportrows{$self->{'symb'}}->{$self->{'filename'}} = \@exportarray; |
|
# |
|
# Save the export data |
|
$self->save_export_data(); |
|
$self->save() if ($self->need_to_save()); |
$self->save() if ($self->need_to_save()); |
if ($connection->aborted()) { $self->cleanup(); return; } |
if ($connection->aborted()) { $self->cleanup(); return; } |
return; |
return; |
Line 760 sub export_data {
|
Line 919 sub export_data {
|
$self->compute($r); |
$self->compute($r); |
} |
} |
if ($connection->aborted()) { $self->cleanup(); return; } |
if ($connection->aborted()) { $self->cleanup(); return; } |
my @Data = @{$Exportrows{$symb}->{$self->{'filename'}}}; |
my @Data; |
if ($Data[0] =~ /^(.*)___=___/) { |
if ($self->badcalc()) { |
$self->{'sheetname'} = $1; |
@Data = (); |
$Data[0] =~ s/^(.*)___=___//; |
} else { |
} |
@Data = @{$Exportrows{$symb}->{$self->{'filename'}}}; |
for (my $i=0;$i<$#Data;$i++) { |
if ($Data[0] =~ /^(.*)___=___/) { |
$Data[$i]="'".$Data[$i]."'" if ($Data[$i]=~/\D/ && defined($Data[$i])); |
$self->{'sheetname'} = $1; |
|
$Data[0] =~ s/^(.*)___=___//; |
|
} |
|
for (my $i=0;$i<$#Data;$i++) { |
|
if ($Data[$i]=~/\D/ && defined($Data[$i])) { |
|
$Data[$i]="'".$Data[$i]."'"; |
|
} |
|
} |
} |
} |
return @Data; |
return @Data; |
} |
} |
Line 789 sub save_export_data {
|
Line 955 sub save_export_data {
|
return if ($self->temporary()); |
return if ($self->temporary()); |
my $student = $self->{'name'}.':'.$self->{'domain'}; |
my $student = $self->{'name'}.':'.$self->{'domain'}; |
my $symb = $self->{'symb'}; |
my $symb = $self->{'symb'}; |
|
if ($self->badcalc()){ |
|
# do not save data away when calculations have not been done properly. |
|
delete($Exportrows{$symb}); |
|
return; |
|
} |
if (! exists($Exportrows{$symb}) || |
if (! exists($Exportrows{$symb}) || |
! exists($Exportrows{$symb}->{$self->{'filename'}})) { |
! exists($Exportrows{$symb}->{$self->{'filename'}})) { |
return; |
return; |
} |
} |
my $key = join(':',($self->{'name'},$self->{'domain'},'assesscalc',$symb)); |
my $key = join(':',($self->{'name'},$self->{'domain'},'assesscalc',$symb)); |
my $timekey = $key.'.time'; |
my $timekey = $key.'.time'; |
my $newstore= join('___;___',@{$Exportrows{$symb}->{$self->{'filename'}}}); |
my $newstore= join('___;___', |
|
map {s/[^[:print:]]//g;$_;} # strip out unprintable |
|
@{$Exportrows{$symb}->{$self->{'filename'}}}); |
$newstore = $self->{'filename'}.'___=___'.$newstore; |
$newstore = $self->{'filename'}.'___=___'.$newstore; |
my $result = &Apache::lonnet::put |
$newExportrows{$student}->{$key} = $newstore; |
('nohist_calculatedsheets_'.$ENV{'request.course.id'}, |
$newExportrows{$student}->{$timekey} = $Exportrows{$symb}->{'time'}; |
{ $key => $newstore, |
|
$timekey => $Exportrows{$symb}->{'time'} }, |
|
$self->{'domain'}, |
|
$self->{'name'}); |
|
|
|
return; |
return; |
} |
} |
|
|