@@ -4,7 +4,7 @@ var reductio_build = require('./build.js');
44var reductio_accessors = require ( './accessors.js' ) ;
55var reductio_parameters = require ( './parameters.js' ) ;
66var reductio_postprocess = require ( './postprocess' ) ;
7- var crossfilter = ( typeof window !== "undefined" ? window . crossfilter : typeof global !== "undefined" ? global . crossfilter : null ) ;
7+ var crossfilter = ( typeof window !== "undefined" ? window [ ' crossfilter' ] : typeof global !== "undefined" ? global [ ' crossfilter' ] : null ) ;
88
99function reductio ( ) {
1010 var parameters = reductio_parameters ( ) ;
@@ -176,7 +176,7 @@ function accessor_build(obj, p) {
176176
177177 // We can take an accessor function, a boolean, or a string
178178 if ( typeof value === 'function' ) {
179- if ( p . sum ) console . warn ( 'SUM aggregation is being overwritten by AVG aggregation' ) ;
179+ if ( p . sum && p . sum !== value ) console . warn ( 'SUM aggregation is being overwritten by AVG aggregation' ) ;
180180 p . sum = value ;
181181 p . avg = true ;
182182 p . count = 'count' ;
@@ -216,7 +216,7 @@ function accessor_build(obj, p) {
216216 value = accessorifyNumeric ( value ) ;
217217
218218 if ( typeof value === 'function' ) {
219- if ( p . valueList ) console . warn ( 'VALUELIST accessor is being overwritten by median aggregation' ) ;
219+ if ( p . valueList && p . valueList !== value ) console . warn ( 'VALUELIST accessor is being overwritten by median aggregation' ) ;
220220 p . valueList = value ;
221221 }
222222 p . median = value ;
@@ -229,7 +229,7 @@ function accessor_build(obj, p) {
229229 value = accessorifyNumeric ( value ) ;
230230
231231 if ( typeof value === 'function' ) {
232- if ( p . valueList ) console . warn ( 'VALUELIST accessor is being overwritten by median aggregation' ) ;
232+ if ( p . valueList && p . valueList !== value ) console . warn ( 'VALUELIST accessor is being overwritten by min aggregation' ) ;
233233 p . valueList = value ;
234234 }
235235 p . min = value ;
@@ -242,7 +242,7 @@ function accessor_build(obj, p) {
242242 value = accessorifyNumeric ( value ) ;
243243
244244 if ( typeof value === 'function' ) {
245- if ( p . valueList ) console . warn ( 'VALUELIST accessor is being overwritten by median aggregation' ) ;
245+ if ( p . valueList && p . valueList !== value ) console . warn ( 'VALUELIST accessor is being overwritten by max aggregation' ) ;
246246 p . valueList = value ;
247247 }
248248 p . max = value ;
@@ -255,7 +255,7 @@ function accessor_build(obj, p) {
255255 value = accessorify ( value ) ;
256256
257257 if ( typeof value === 'function' ) {
258- if ( p . sum ) console . warn ( 'EXCEPTION accessor is being overwritten by exception count aggregation' ) ;
258+ if ( p . exceptionAccessor && p . exceptionAccessor !== value ) console . warn ( 'EXCEPTION accessor is being overwritten by exception count aggregation' ) ;
259259 p . exceptionAccessor = value ;
260260 p . exceptionCount = true ;
261261 } else {
@@ -875,7 +875,7 @@ module.exports = reductio_filter;
875875
876876} , { } ] , 14 :[ function ( require , module , exports ) {
877877( function ( global ) {
878- var crossfilter = ( typeof window !== "undefined" ? window . crossfilter : typeof global !== "undefined" ? global . crossfilter : null ) ;
878+ var crossfilter = ( typeof window !== "undefined" ? window [ ' crossfilter' ] : typeof global !== "undefined" ? global [ ' crossfilter' ] : null ) ;
879879
880880var reductio_histogram = {
881881 add : function ( a , prior , path ) {
@@ -1045,7 +1045,7 @@ var reductio_min = {
10451045module . exports = reductio_min ;
10461046} , { } ] , 18 :[ function ( require , module , exports ) {
10471047( function ( global ) {
1048- var crossfilter = ( typeof window !== "undefined" ? window . crossfilter : typeof global !== "undefined" ? global . crossfilter : null ) ;
1048+ var crossfilter = ( typeof window !== "undefined" ? window [ ' crossfilter' ] : typeof global !== "undefined" ? global [ ' crossfilter' ] : null ) ;
10491049
10501050var reductio_nest = {
10511051 add : function ( keyAccessors , prior , path ) {
@@ -1306,7 +1306,7 @@ var reductio_sum = {
13061306module . exports = reductio_sum ;
13071307} , { } ] , 26 :[ function ( require , module , exports ) {
13081308( function ( global ) {
1309- var crossfilter = ( typeof window !== "undefined" ? window . crossfilter : typeof global !== "undefined" ? global . crossfilter : null ) ;
1309+ var crossfilter = ( typeof window !== "undefined" ? window [ ' crossfilter' ] : typeof global !== "undefined" ? global [ ' crossfilter' ] : null ) ;
13101310
13111311var reductio_value_count = {
13121312 add : function ( a , prior , path ) {
@@ -1351,7 +1351,7 @@ module.exports = reductio_value_count;
13511351} ) . call ( this , typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : { } )
13521352} , { } ] , 27 :[ function ( require , module , exports ) {
13531353( function ( global ) {
1354- var crossfilter = ( typeof window !== "undefined" ? window . crossfilter : typeof global !== "undefined" ? global . crossfilter : null ) ;
1354+ var crossfilter = ( typeof window !== "undefined" ? window [ ' crossfilter' ] : typeof global !== "undefined" ? global [ ' crossfilter' ] : null ) ;
13551355
13561356var reductio_value_list = {
13571357 add : function ( a , prior , path ) {
0 commit comments