--- loncom/interface/spreadsheet/Spreadsheet.pm 2005/10/13 10:27:28 1.58 +++ loncom/interface/spreadsheet/Spreadsheet.pm 2006/01/10 16:38:47 1.61 @@ -1,5 +1,5 @@ # -# $Id: Spreadsheet.pm,v 1.58 2005/10/13 10:27:28 albertel Exp $ +# $Id: Spreadsheet.pm,v 1.61 2006/01/10 16:38:47 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -378,10 +378,12 @@ Calls the system EXT function to determi #------------------------------------------------------- sub EXT { - my ($parameter) = @_; + my ($parameter,$specific_symb) = @_; return '' if (! defined($parameter) || $parameter eq ''); $parameter =~ s/^parameter\./resource\./; - my $value = &Apache::lonnet::EXT($parameter,$symb,$domain,$name,$usection); + if ($specific_symb eq '') { $specific_symb = $symb; } + my $value = &Apache::lonnet::EXT($parameter,$specific_symb,$domain,$name, + $usection); return $value; } @@ -697,7 +699,7 @@ sub get_values { } return \@values; } else { - $num = '(\d+)'; + $num = '([1-9]\d*)'; } if (($la eq '*') || ($ua eq '*')) { $alpha='[A-z]'; @@ -1665,7 +1667,7 @@ sub load { sub cache_sheet { my $self = shift; - my $formulas=(@_); + my ($formulas) = @_; my $stype = $self->{'type'}; my $cnum = $self->{'cnum'}; my $cdom = $self->{'cdom'};