--- loncom/interface/spreadsheet/Spreadsheet.pm 2005/04/07 06:56:23 1.41 +++ loncom/interface/spreadsheet/Spreadsheet.pm 2005/04/29 18:13:07 1.43 @@ -1,5 +1,5 @@ # -# $Id: Spreadsheet.pm,v 1.41 2005/04/07 06:56:23 albertel Exp $ +# $Id: Spreadsheet.pm,v 1.43 2005/04/29 18:13:07 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -596,7 +596,7 @@ sub SUMMAX { foreach (grep eval("/$mask/"),keys(%sheet_values)) { push (@inside,$sheet_values{$_}); } - @inside=sort(@inside); + @inside=sort {$a <=> $b} (@inside); my $sum=0; my $i; for ($i=$#inside;(($i>$#inside-$num) && ($i>=0));$i--) { $sum+=$inside[$i]; @@ -623,7 +623,7 @@ sub SUMMIN { foreach (grep eval("/$mask/"),keys(%sheet_values)) { $inside[$#inside+1]=$sheet_values{$_}; } - @inside=sort(@inside); + @inside=sort {$a <=> $b} (@inside); my $sum=0; my $i; for ($i=0;(($i<$num) && ($i<=$#inside));$i++) { $sum+=$inside[$i]; @@ -937,7 +937,8 @@ sub sett { $t{$cell}=~s/(^|[^\"\'])([A-Za-z]\d+)/$1\$sheet_values\{\'$2\'\}/g; $t{$cell}=~s/(^|[^\"\'])\[([^\]]+)\]/$1.$self->expandnamed($2)/ge; } elsif ( $col =~ /^[A-Z]$/ ) { - if ($formula !~ /^\!/ && exists($self->{'constants'}->{$cell})) { + if ($formula !~ /^\!/ && exists($self->{'constants'}->{$cell}) + && $self->{'constants'}->{$cell} ne '') { my $data = $self->{'constants'}->{$cell}; $t{$cell} = $data; }