diff --git a/WeaveData/src/weave/data/AttributeColumns/NumberColumn.as b/WeaveData/src/weave/data/AttributeColumns/NumberColumn.as index 6bcbf9efb6..bd943c9321 100644 --- a/WeaveData/src/weave/data/AttributeColumns/NumberColumn.as +++ b/WeaveData/src/weave/data/AttributeColumns/NumberColumn.as @@ -113,10 +113,21 @@ package weave.data.AttributeColumns { var number:Number = getValueFromKey(key, Number); if (numberToStringFunction != null) + { return StandardLib.asString(numberToStringFunction(number, array)); + } + if (isNaN(number) && array && array.length > 1) + { + var aggregation:String = (_metadata && _metadata[ColumnMetadata.AGGREGATION]) as String || Aggregation.DEFAULT; + if (aggregation == Aggregation.SAME) + return StringColumn.AMBIGUOUS_DATA; + } return StandardLib.formatNumber(number); } + if (dataType === IQualifiedKey) + return WeaveAPI.QKeyManager.getQKey(DataType.NUMBER, getValueFromKey(key, Number)); + return null; }