version 1.36, 2005/02/05 06:56:24
|
version 1.58, 2007/01/23 01:36:26
|
Line 104 my %nice_parameter_name;
|
Line 104 my %nice_parameter_name;
|
my %useropt; |
my %useropt; |
my %userdata; |
my %userdata; |
my %courseopt; |
my %courseopt; |
|
my $navmap; |
|
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
Line 124 sub clear_package {
|
Line 125 sub clear_package {
|
if (defined($current_name) && |
if (defined($current_name) && |
defined($current_domain) && |
defined($current_domain) && |
defined($current_course) && |
defined($current_course) && |
$current_course eq $ENV{'request.course.id'} && |
$current_course eq $env{'request.course.id'} && |
%newExportrows) { |
%newExportrows) { |
&save_cached_export_rows($current_name,$current_domain); |
&save_cached_export_rows($current_name,$current_domain); |
} |
} |
Line 136 sub clear_package {
|
Line 137 sub clear_package {
|
undef(%useropt); |
undef(%useropt); |
undef(%userdata); |
undef(%userdata); |
undef(%courseopt); |
undef(%courseopt); |
|
undef($navmap); |
} |
} |
|
|
sub save_cached_export_rows { |
sub save_cached_export_rows { |
my ($sname,$sdomain) = @_; |
my ($sname,$sdomain) = @_; |
my $start = Time::HiRes::time; |
|
my $result = &Apache::lonnet::put |
my $result = &Apache::lonnet::put |
('nohist_calculatedsheets_'.$ENV{'request.course.id'}, |
('nohist_calculatedsheets_'.$env{'request.course.id'}, |
$newExportrows{$sname.':'.$sdomain}, |
$newExportrows{$sname.':'.$sdomain}, |
$sdomain,$sname); |
$sdomain,$sname); |
delete($newExportrows{$sname.':'.$sdomain}); |
delete($newExportrows{$sname.':'.$sdomain}); |
} |
} |
|
|
sub initialize { |
sub initialize { |
|
my ($in_navmap) = @_; |
&clear_package(); |
&clear_package(); |
|
$navmap = $in_navmap; |
|
if (! defined($navmap)) { |
|
$navmap = Apache::lonnavmaps::navmap->new(); |
|
} |
|
if (!defined($navmap)) { |
|
&Apache::lonnet::logthis('assesscalc:Can not open Coursemap'); |
|
} |
&Apache::loncoursedata::clear_internal_caches(); |
&Apache::loncoursedata::clear_internal_caches(); |
} |
} |
|
|
Line 165 sub initialize {
|
Line 174 sub initialize {
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
sub initialize_package { |
sub initialize_package { |
my ($sname,$sdomain) = @_; |
my ($sname,$sdomain,$in_navmap,$calling_sheet) = @_; |
$current_name = $sname; |
$current_name = $sname; |
$current_domain = $sdomain; |
$current_domain = $sdomain; |
|
$navmap = $in_navmap; |
undef(%useropt); |
undef(%useropt); |
undef(%userdata); |
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($calling_sheet); |
&Apache::loncoursedata::clear_internal_caches(); |
&Apache::loncoursedata::clear_internal_caches(); |
} |
} |
|
|
Line 192 sub initialize_package {
|
Line 202 sub initialize_package {
|
######################################################## |
######################################################## |
######################################################## |
######################################################## |
sub load_parameter_caches { |
sub load_parameter_caches { |
|
my ($calling_sheet) = @_; |
my $userprefix = $current_name.':'.$current_domain.'_'; |
my $userprefix = $current_name.':'.$current_domain.'_'; |
$userprefix =~ s/:/_/g; |
$userprefix =~ s/:/_/g; |
# |
# |
# Course Parameters Cache |
# Course Parameters Cache |
if (! %courseopt) { |
if (! %courseopt) { |
$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)) { |
return; |
return; |
} |
} |
my $dom = $ENV{'course.'.$ENV{'request.course.id'}.'.domain'}; |
my $dom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $id = $ENV{'course.'.$ENV{'request.course.id'}.'.num'}; |
my $id = $env{'course.'.$env{'request.course.id'}.'.num'}; |
my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id); |
my %Tmp = &Apache::lonnet::dump('resourcedata',$dom,$id); |
while (my ($name,$value) = each(%Tmp)) { |
while (my ($name,$value) = each(%Tmp)) { |
$courseopt{$name}=$value; |
$courseopt{$name}=$value; |
Line 224 sub load_parameter_caches {
|
Line 235 sub load_parameter_caches {
|
if (! %userdata) { |
if (! %userdata) { |
%userdata = &Apache::loncoursedata::get_current_state($current_name, |
%userdata = &Apache::loncoursedata::get_current_state($current_name, |
$current_domain); |
$current_domain); |
|
my ($tmp) = %userdata; |
|
if ($tmp =~ /^error:(.*)/) { |
|
$calling_sheet->set_calcerror($1); |
|
} |
$userdata{'loadtime'} = time; |
$userdata{'loadtime'} = time; |
} |
} |
return; |
return; |
Line 246 sub ensure_current_caches {
|
Line 261 sub ensure_current_caches {
|
## Check for a modified parameters |
## Check for a modified parameters |
## |
## |
if (! defined($current_course) || |
if (! defined($current_course) || |
$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(%useropt); |
undef(%userdata); |
undef(%userdata); |
Line 262 sub ensure_current_caches {
|
Line 277 sub ensure_current_caches {
|
undef(%useropt); |
undef(%useropt); |
undef(%userdata); |
undef(%userdata); |
} |
} |
&load_parameter_caches(); |
&load_parameter_caches($self); |
} |
} |
|
|
################################################## |
################################################## |
Line 280 Returns: The value of a parameter, or ''
|
Line 295 Returns: The value of a parameter, or ''
|
|
|
This function cascades through the possible levels searching for a value for |
This function cascades through the possible levels searching for a value for |
a parameter. The levels are checked in the following order: |
a parameter. The levels are checked in the following order: |
user, course (at section level and course level), map, and lonnet::metadata. |
user, course (at group, section level and course level), map, and |
|
lonnet::metadata. |
This function uses %parmhash, which must be tied prior to calling it. |
This function uses %parmhash, which must be tied prior to calling it. |
This function also requires %courseopt and %useropt to be initialized for |
This function also requires %courseopt and %useropt to be initialized for |
this user and course. |
this user and course. |
Line 291 this user and course.
|
Line 307 this user and course.
|
################################################## |
################################################## |
sub parmval { |
sub parmval { |
my $self = shift; |
my $self = shift; |
my ($what,$symb,$uname,$udom,$csec,$recurse)=@_; |
my ($what,$symb,$uname,$udom,$csec,$recurse,$mapname,$id,$fn,$groups)=@_; |
$uname = $self->{'name'} if (! defined($uname)); |
$uname = $self->{'name'} if (! defined($uname)); |
$udom = $self->{'domain'} if (! defined($udom)); |
$udom = $self->{'domain'} if (! defined($udom)); |
$csec = $self->{'section'} if (! defined($csec)); |
$csec = $self->{'section'} if (! defined($csec)); |
$symb = $self->{'symb'} if (! defined($symb)); |
$groups = $self->{'groups'} if (! defined($groups)); |
|
$symb = $self->{'symb'} if (! defined($symb)); |
# |
# |
my $result=''; |
my $result=''; |
# |
# |
# This should be a |
# This should be a |
my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb); |
if (!defined($mapname) || !defined($id) || !defined($fn)) { |
|
($mapname,$id,$fn)=&Apache::lonnet::decode_symb($symb); |
|
$mapname = &Apache::lonnet::deversion($mapname); |
|
} |
# Cascading lookup scheme |
# Cascading lookup scheme |
my $rwhat=$what; |
my $rwhat=$what; |
$what =~ s/^parameter\_//; |
$what =~ s/^parameter\_//; |
Line 322 sub parmval {
|
Line 342 sub parmval {
|
my $ucourselevel = $usercourseprefix.'.'.$what; |
my $ucourselevel = $usercourseprefix.'.'.$what; |
my $ucourselevelr = $usercourseprefix.'.'.$symbparm; |
my $ucourselevelr = $usercourseprefix.'.'.$symbparm; |
my $ucourselevelm = $usercourseprefix.'.'.$mapparm; |
my $ucourselevelm = $usercourseprefix.'.'.$mapparm; |
# check user |
# check user |
if (defined($uname)) { |
if (defined($uname)) { |
return $useropt{$ucourselevelr} if (defined($useropt{$ucourselevelr})); |
return $useropt{$ucourselevelr} if (defined($useropt{$ucourselevelr})); |
return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm})); |
return $useropt{$ucourselevelm} if (defined($useropt{$ucourselevelm})); |
return $useropt{$ucourselevel} if (defined($useropt{$ucourselevel})); |
return $useropt{$ucourselevel} if (defined($useropt{$ucourselevel})); |
} |
} |
|
# check groups |
|
if (defined($groups) && ref($groups) eq 'ARRAY') { |
|
foreach my $group (@{$groups}) { |
|
foreach my $level ($symbparm,$mapparm,$what) { |
|
my $item = $courseprefix.'.['.$group.'].'.$level; |
|
if (defined($courseopt{$item})) { |
|
return $courseopt{$item}; |
|
} |
|
} |
|
} |
|
} |
# check section |
# check section |
if (defined($csec)) { |
if (defined($csec)) { |
return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr})); |
return $courseopt{$seclevelr} if (defined($courseopt{$seclevelr})); |
Line 357 sub parmval {
|
Line 388 sub parmval {
|
if ($part eq '') { $part='0'; } |
if ($part eq '') { $part='0'; } |
my $newwhat=$rwhat; |
my $newwhat=$rwhat; |
$newwhat=~s/\Q$space\E/$part/; |
$newwhat=~s/\Q$space\E/$part/; |
my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1); |
my $partgeneral=$self->parmval($newwhat,$symb,$uname,$udom,$csec,1, |
|
$mapname,$id,$fn,$groups); |
if (defined($partgeneral)) { return $partgeneral; } |
if (defined($partgeneral)) { return $partgeneral; } |
} |
} |
if ($recurse) { return undef; } |
if ($recurse) { return undef; } |
Line 502 sub assess_html_row {
|
Line 534 sub assess_html_row {
|
my @rowdata = $self->get_row($row); |
my @rowdata = $self->get_row($row); |
my $num_cols_output = 0; |
my $num_cols_output = 0; |
my $row_html; |
my $row_html; |
if (exists($nice_parameter_name{$parameter_name})) { |
my $name=$self->get_parm_name($parameter_name); |
my $name = $nice_parameter_name{$parameter_name}; |
if ($name ne '') { |
$name =~ s/ /\ /g; |
$name =~ s/ /\ /g; |
$row_html .= '<td>'.$name.'<br />'.$parameter_name.'</td>'; |
$row_html .= '<td>'.$name.'<br />'.$parameter_name.'</td>'; |
} else { |
} else { |
Line 515 sub assess_html_row {
|
Line 547 sub assess_html_row {
|
$row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell, |
$row_html .= &Apache::Spreadsheet::html_uneditable_cell($cell, |
'#FFDDDD'); |
'#FFDDDD'); |
} else { |
} else { |
$row_html .= '<td bgcolor="#EOFFDD">'; |
$row_html .= '<td bgcolor="#E0FFDD">'; |
$row_html .= &Apache::Spreadsheet::html_editable_cell($cell, |
$row_html .= &Apache::Spreadsheet::html_editable_cell($cell, |
'#E0FFDD',1); |
'#E0FFDD',1); |
} |
} |
Line 538 sub csv_rows {
|
Line 570 sub csv_rows {
|
# Write each row |
# Write each row |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
my $parameter_name = $self->{'formulas'}->{'A'.$rownum}; |
my $parameter_name = $self->{'formulas'}->{'A'.$rownum}; |
my $description = ''; |
my $description = $self->get_parm_name($parameter_name); |
if (exists($nice_parameter_name{$parameter_name})) { |
|
$description = $nice_parameter_name{$parameter_name}; |
|
} |
|
$self->csv_output_row($filehandle,$rownum, |
$self->csv_output_row($filehandle,$rownum, |
$parameter_name,$description); |
$parameter_name,$description); |
} |
} |
Line 552 sub excel_rows {
|
Line 581 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 ($connection,$worksheet,$cols_output,$rows_output) = @_; |
my ($connection,$worksheet,$cols_output,$rows_output,$format) = @_; |
return if (! ref($worksheet)); |
return if (! ref($worksheet)); |
# |
# |
# Write a header row |
# Write a header row |
$cols_output = 0; |
$cols_output = 0; |
foreach my $value ('Parameter','Description','Value') { |
foreach my $value ('Parameter','Description','Value') { |
$worksheet->write($rows_output,$cols_output++,$value); |
$worksheet->write($rows_output,$cols_output++,$value,$format->{'h4'}); |
} |
} |
$rows_output++; |
$rows_output++; |
# |
# |
# Write each row |
# Write each row |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
foreach my $rownum (sort {$a <=> $b} ($self->rows())) { |
my $parameter_name = $self->{'formulas'}->{'A'.$rownum}; |
my $parameter_name = $self->{'formulas'}->{'A'.$rownum}; |
my $description = ''; |
my $description = $self->get_parm_name($parameter_name); |
if (exists($nice_parameter_name{$parameter_name})) { |
|
$description = $nice_parameter_name{$parameter_name}; |
|
} |
|
$self->excel_output_row($worksheet,$rownum,$rows_output++, |
$self->excel_output_row($worksheet,$rownum,$rows_output++, |
$parameter_name,$description); |
$parameter_name,$description); |
} |
} |
Line 578 sub excel_rows {
|
Line 604 sub excel_rows {
|
## |
## |
## Routines to support assesscalc::compute |
## Routines to support assesscalc::compute |
## |
## |
sub get_parm_names { |
sub get_parm { |
my $self = shift; |
my $self = shift; |
my @Mandatory_parameters = @_; |
my @Mandatory_parameters = @_; |
my %parameters_and_names; |
my %parameters; |
# |
# |
my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'}); |
my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'}); |
my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); |
my @Metadata = split(/\,/,&Apache::lonnet::metadata($srcf,'keys')); |
Line 590 sub get_parm_names {
|
Line 616 sub get_parm_names {
|
my $cleaned_name = $parm; |
my $cleaned_name = $parm; |
$cleaned_name =~ s/^resource\./stores_/; |
$cleaned_name =~ s/^resource\./stores_/; |
$cleaned_name =~ s/\./_/g; |
$cleaned_name =~ s/\./_/g; |
my $display = &Apache::lonnet::metadata($srcf, |
$parameters{$cleaned_name}=1; |
$cleaned_name.'.display'); |
|
if (! $display) { |
|
$display .= &Apache::lonnet::metadata($srcf,$cleaned_name.'.name'); |
|
} |
|
$parameters_and_names{$cleaned_name}=$display; |
|
} |
} |
return (%parameters_and_names); |
return (keys(%parameters)); |
|
} |
|
|
|
sub get_parm_name { |
|
my $self = shift; |
|
my $parm = shift; |
|
my ($symap,$syid,$srcf) = &Apache::lonnet::decode_symb($self->{'symb'}); |
|
my $display = &Apache::lonnet::metadata($srcf,$parm.'.display'); |
|
if (! $display) { |
|
$display .= &Apache::lonnet::metadata($srcf,$parm.'.name'); |
|
} |
|
return $display; |
} |
} |
|
|
sub get_parameter_values { |
sub get_parameter_values { |
Line 617 sub get_parameter_values {
|
Line 649 sub get_parameter_values {
|
my $filename = $self->{'coursefilename'}.'_parms.db'; |
my $filename = $self->{'coursefilename'}.'_parms.db'; |
if (tie(%parmhash,'GDBM_File', |
if (tie(%parmhash,'GDBM_File', |
$self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
$self->{'coursefilename'}.'_parms.db',&GDBM_READER(),0640)) { |
|
my ($mapname,$id,$fn)=&Apache::lonnet::decode_symb($self->{'symb'}); |
|
$mapname = &Apache::lonnet::deversion($mapname); |
foreach my $parmname (@Parameters) { |
foreach my $parmname (@Parameters) { |
my $value = $self->parmval($parmname); |
my $value = $self->parmval($parmname,$self->{'symb'}, |
|
$self->{'name'},$self->{'domain'}, |
|
$self->{'section'},undef, |
|
$mapname,$id,$fn,$self->{'groups'}); |
$parameters{$parmname} =$value; |
$parameters{$parmname} =$value; |
} |
} |
untie(%parmhash); |
untie(%parmhash); |
Line 651 sub get_problem_state {
|
Line 688 sub get_problem_state {
|
|
|
sub determine_parts { |
sub determine_parts { |
my $self = shift; |
my $self = shift; |
|
my $check_hidden = shift; |
if (exists($self->{'Parts'}) && ref($self->{'Parts'}) eq 'HASH') { |
if (exists($self->{'Parts'}) && ref($self->{'Parts'}) eq 'HASH') { |
return; |
return; |
} |
} |
Line 661 sub determine_parts {
|
Line 699 sub determine_parts {
|
my $metadata = &Apache::lonnet::metadata($src,'packages'); |
my $metadata = &Apache::lonnet::metadata($src,'packages'); |
foreach (split(',',$metadata)) { |
foreach (split(',',$metadata)) { |
my ($part) = (/^part_(.*)$/); |
my ($part) = (/^part_(.*)$/); |
if (defined($part) && |
if (!defined($part)) { next; } |
! &Apache::loncommon::check_if_partid_hidden |
if (!$check_hidden) { $Parts{$part}++; next; } |
($part,$self->{'symb'},$self->{'name'},$self->{'domain'}) |
if (!&Apache::loncommon::check_if_partid_hidden |
|
($part,$self->{'symb'},$self->{'name'},$self->{'domain'}) |
) { |
) { |
$Parts{$part}++; |
$Parts{$part}++; |
} |
} |
Line 684 sub parameter_part_is_valid {
|
Line 723 sub parameter_part_is_valid {
|
return 1; |
return 1; |
} |
} |
# |
# |
my (undef,$part) = |
my ($start,@pieces)=split('_',$parameter); |
($parameter =~ m/^(resource|stores|parameter)_([^_]+)_.*/); |
if ( $start !~ m/^(resource|stores|parameter)$/) { return 0; } |
if (exists($self->{'Parts'}) && |
while (@pieces) { |
exists($self->{'Parts'}->{$part}) && |
pop(@pieces); |
$self->{'Parts'}->{$part} ) { |
my $testpart=join('_',@pieces); |
return 1; |
if (exists($self->{'Parts'}->{$testpart}) && |
} else { |
$self->{'Parts'}->{$testpart} ) { |
return 0; |
return 1; |
|
} |
} |
} |
|
return 0; |
} |
} |
|
|
sub compute { |
sub compute { |
my $self = shift; |
my $self = shift; |
my ($r) = @_; |
my ($r) = @_; |
my $connection = $r->connection(); |
|
if ($connection->aborted()) { $self->cleanup(); return; } |
|
$self->initialize_safe_space(); |
$self->initialize_safe_space(); |
######################################### |
######################################### |
######################################### |
######################################### |
Line 720 sub compute {
|
Line 759 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 %nice_parm_names = $self->get_parm_names(@Mandatory_parameters); |
my @parameters=$self->get_parm(@Mandatory_parameters); |
while (my($cleaned_name,$display) = each(%nice_parm_names)) { |
|
$parameters{$cleaned_name}++; |
|
$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; } |
|
$self->ensure_current_caches(); |
$self->ensure_current_caches(); |
if ($connection->aborted()) { $self->cleanup(); return; } |
%parameters = $self->get_parameter_values(@parameters); |
%parameters = $self->get_parameter_values(keys(%parameters)); |
|
if ($connection->aborted()) { $self->cleanup(); return; } |
|
# |
# |
# Clean out unnecessary parameters |
# Clean out unnecessary parameters |
foreach (keys(%parameters)) { |
foreach (keys(%parameters)) { |
Line 739 sub compute {
|
Line 771 sub compute {
|
} |
} |
# |
# |
# Get the students performance data |
# Get the students performance data |
|
$self->determine_parts(($parameters{'parameter_0_hiddenparts'} ne '')); |
my %student_parameters = $self->get_problem_state(); |
my %student_parameters = $self->get_problem_state(); |
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; |
# Clean out any bad parameters |
} |
next if (! $self->parameter_part_is_valid($parm)); |
# |
$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 |
Line 759 sub compute {
|
Line 786 sub compute {
|
my %c; |
my %c; |
# |
# |
# Check for blackout requirements |
# Check for blackout requirements |
if ((!exists($ENV{'request.role.adv'}) || !$ENV{'request.role.adv'})) { |
if ((!exists($env{'request.role.adv'}) || !$env{'request.role.adv'})) { |
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$/); |
Line 773 sub compute {
|
Line 800 sub compute {
|
} |
} |
} |
} |
} |
} |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
# |
# |
# Move the parameters into the spreadsheet |
# Move the parameters into the spreadsheet |
while (my ($parm,$value) = each(%parameters)) { |
while (my ($parm,$value) = each(%parameters)) { |
Line 785 sub compute {
|
Line 811 sub compute {
|
$value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/); |
$value = 'q{'.$value.'}' if ($value =~/([^\d\.]|\.\.)/); |
$c{$parm} = $value; |
$c{$parm} = $value; |
} |
} |
|
foreach my $cell (grep(/^A/,keys(%f))) { |
|
# Clean out any bad formulas |
|
next if (exists($c{$f{$cell}})); |
|
next if ($cell eq 'A0'); |
|
delete($f{$cell}); |
|
} |
$self->formulas(\%f); |
$self->formulas(\%f); |
$self->constants(\%c); |
$self->constants(\%c); |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
$self->calcsheet(); |
$self->calcsheet(); |
# |
# |
# Store export row in cache |
# Store export row in cache |
my @exportarray = $self->exportrow(); |
my @exportarray = $self->exportrow(); |
$self->deal_with_export_row(@exportarray); |
$self->deal_with_export_row(@exportarray); |
$self->save() if ($self->need_to_save()); |
$self->save() if ($self->need_to_save()); |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
return; |
return; |
} |
} |
|
|
Line 804 sub compute {
|
Line 834 sub compute {
|
sub sett { |
sub sett { |
my $self = shift; |
my $self = shift; |
my %t=(); |
my %t=(); |
|
undef(%Apache::Spreadsheet::sheet_values); |
# |
# |
# Deal with the template row by copying the template formulas into each |
# Deal with the template row by copying the template formulas into each |
# row. |
# row. |
Line 821 sub sett {
|
Line 852 sub sett {
|
# Replace 'A0' with the value from 'A0' |
# Replace 'A0' with the value from 'A0' |
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; |
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; |
# Replace parameters |
# Replace parameters |
$t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge; |
$t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/sge; |
} |
} |
} |
} |
# |
# |
Line 829 sub sett {
|
Line 860 sub sett {
|
while (my ($cell,$formula) = each(%{$self->{'formulas'}})) { |
while (my ($cell,$formula) = each(%{$self->{'formulas'}})) { |
next if ($cell =~ /template_/); |
next if ($cell =~ /template_/); |
if ($cell =~ /^A/ && $cell ne 'A0') { |
if ($cell =~ /^A/ && $cell ne 'A0') { |
if ($formula !~ /^\!/) { |
if ($formula !~ /^\!/ |
$t{$cell}=$self->{'constants'}->{$formula}; |
&& exists($self->{'constants'}->{$formula}) |
|
&& $self->{'constants'}->{$formula} ne '' |
|
) { |
|
$Apache::Spreadsheet::sheet_values{$cell}= |
|
eval($self->{'constants'}->{$formula}); |
} |
} |
} else { |
} else { |
$t{$cell}=$formula; |
$t{$cell}=$formula; |
$t{$cell}=~s/\.\.+/\,/g; |
$t{$cell}=~s/\.\.+/\,/g; |
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; |
$t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; |
$t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge; |
$t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/sge; |
} |
} |
} |
} |
# Put %t into the safe space |
# Put %t into the safe space |
Line 865 These rows are saved in the students dir
|
Line 900 These rows are saved in the students dir
|
sub load_cached_export_rows { |
sub load_cached_export_rows { |
undef(%Exportrows); |
undef(%Exportrows); |
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'. |
my @tmp = &Apache::lonnet::dump('nohist_calculatedsheets_'. |
$ENV{'request.course.id'}, |
$env{'request.course.id'}, |
$current_domain,$current_name,undef); |
$current_domain,$current_name,undef); |
if ($tmp[0]!~/^error/) { |
if ($tmp[0]!~/^error/) { |
my %tmp = @tmp; |
my %tmp = @tmp; |
my $default_filename = $ENV{'course.'.$ENV{'request.course.id'}. |
my $default_filename = $env{'course.'.$env{'request.course.id'}. |
'.spreadsheet_default_assesscalc'}; |
'.spreadsheet_default_assesscalc'}; |
# We only got one key, so we will access it directly. |
# We only got one key, so we will access it directly. |
while (my ($key,$sheetdata) = each(%tmp)) { |
while (my ($key,$sheetdata) = each(%tmp)) { |
Line 909 spreadsheet only if necessary.
|
Line 944 spreadsheet only if necessary.
|
sub export_data { |
sub export_data { |
my $self = shift; |
my $self = shift; |
my ($r) = @_; |
my ($r) = @_; |
my $connection = $r->connection(); |
|
my $symb = $self->{'symb'}; |
my $symb = $self->{'symb'}; |
if (! exists($ENV{'request.role.adv'}) || ! $ENV{'request.role.adv'} || |
if (! exists($env{'request.role.adv'}) || ! $env{'request.role.adv'} || |
! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb}) || |
! exists($Exportrows{$symb}) || ! defined($Exportrows{$symb}) || |
! $self->check_expiration_time($Exportrows{$symb}->{'time'}) || |
! $self->check_expiration_time($Exportrows{$symb}->{'time'}) || |
! exists($Exportrows{$symb}->{$self->{'filename'}}) || |
! exists($Exportrows{$symb}->{$self->{'filename'}}) || |
Line 920 sub export_data {
|
Line 954 sub export_data {
|
) { |
) { |
$self->compute($r); |
$self->compute($r); |
} |
} |
if ($connection->aborted()) { $self->cleanup(); return; } |
|
my @Data; |
my @Data; |
if ($self->badcalc()) { |
if ($self->badcalc()) { |
@Data = (); |
@Data = (); |