loncom/interface/spreadsheet/assesscalc.pm - diff

Return to assesscalc.pm CVS log

Up to [LON-CAPA] / loncom / interface / spreadsheet

version 1.57, 2006/12/21 02:54:19	version 1.58, 2007/01/23 01:36:26
Line 852 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 871 sub sett {	Line 871 sub sett {
$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