--- loncom/interface/spreadsheet/Spreadsheet.pm 2006/03/05 21:35:10 1.64 +++ loncom/interface/spreadsheet/Spreadsheet.pm 2006/04/06 16:43:49 1.66 @@ -1,5 +1,5 @@ # -# $Id: Spreadsheet.pm,v 1.64 2006/03/05 21:35:10 bowersj2 Exp $ +# $Id: Spreadsheet.pm,v 1.66 2006/04/06 16:43:49 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -85,7 +85,7 @@ sub new { my $class = ref($this) || $this; my ($stype) = ($class =~ /Apache::(.*)$/); # - my ($name,$domain,$filename,$usymb)=@_; + my ($name,$domain,$filename,$usymb,$section)=@_; if (defined($usymb) && ref($usymb)) { $usymb = $usymb->symb; } @@ -95,10 +95,15 @@ sub new { if (! defined($domain) || $domain eq '') { $domain = $env{'user.domain'}; } + if (! defined($section) || $section eq '') { + $section = &Apache::lonnet::getsection($domain,$name, + $env{'request.course.id'}); + } # my $self = { name => $name, domain => $domain, + section => $section, type => $stype, symb => $usymb, errorlog => '', @@ -722,7 +727,7 @@ sub calc { $notfinished=0; while (my ($cell,$value) = each(%t)) { my $old=$sheet_values{$cell}; - #$sheet_values{$cell}=eval $value; + $sheet_values{$cell}=eval $value; # $errorlog .= $cell.' = '.$old.'->'.$sheet_values{$cell}."\n"; if ($@) { undef %sheet_values; @@ -1290,15 +1295,13 @@ sub html_editable_cell { } $name = '' if (! defined($name)); $formula = '' if (! defined($formula)); - if ($showsource) - { + if ($showsource) { if (!defined($formula) || $formula =~ /^\s*$/) { $value = '#'; } else { $value = &HTML::Entities::encode($formula, '<>&"'); } - } - elsif (! defined($value)) { + } elsif (! defined($value)) { $value = '#'; if ($formula ne '') { $value = 'undefined value';