| author | lzhang | 2012-01-10 23:27:53 (EST) |
|---|---|---|
| committer | mwu | 2012-01-10 23:27:53 (EST) |
| commit | 8f27563f7a5246bed07d7f0e2f8992786916c66c (patch) (side-by-side diff) | |
| tree | 42aa3edb442763afc902fd20f74a2e8b303f91cb | |
| parent | ae1bf25289a0457fe4b7c5d698dcf47df197b022 (diff) | |
| download | org.eclipse.birt-8f27563f7a5246bed07d7f0e2f8992786916c66c.zip org.eclipse.birt-8f27563f7a5246bed07d7f0e2f8992786916c66c.tar.gz org.eclipse.birt-8f27563f7a5246bed07d7f0e2f8992786916c66c.tar.bz2 | |
Checkin: [Automation] Nothing display when add 2 filter on xtab and
unselect "Recalculate Totals" [46579]
2 files changed, 2 insertions, 3 deletions
diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/filter/AggregationFilterHelper.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/filter/AggregationFilterHelper.java index b0fd23a..38ddb14 100644 --- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/filter/AggregationFilterHelper.java +++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/data/impl/aggregation/filter/AggregationFilterHelper.java @@ -380,7 +380,8 @@ public class AggregationFilterHelper for ( int k = 0; k < this.aggrFilters.size( ); k++ ) { IJSDimensionFilterHelper filterHelper = (IJSDimensionFilterHelper) ( (AggrFilterDefinition) aggrFilters.get( k ) ).getFilterHelper( ); - if ( !filterHelper.evaluateFilter( row4filter ) ) + if ( isMatch( rs[i].getAggregationDefinition( ), + rs[i],(AggrFilterDefinition) aggrFilters.get( k )) && (!filterHelper.evaluateFilter( row4filter )) ) { isFilterByAll = false; break; diff --git a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/query/view/QueryExecutor.java b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/query/view/QueryExecutor.java index 859c461..3939ae3 100644 --- a/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/query/view/QueryExecutor.java +++ b/data/org.eclipse.birt.data/src/org/eclipse/birt/data/engine/olap/query/view/QueryExecutor.java @@ -157,7 +157,6 @@ public class QueryExecutor rs = populateRs( view, finalAggregation, cubeQueryExecutorHelper, stopSign, true, fetcher ); - rs = applyNoAggrUpdateFilters( getNoAggrUpdateFilters( executor.getCubeQueryDefinition( ).getFilters( ) ),executor, rs, cube, fetcher ); rs = processOperationOnQuery( view, stopSign, rs, aggrDefns ); break; @@ -166,7 +165,6 @@ public class QueryExecutor { rs = populateRs( view, finalAggregation, cubeQueryExecutorHelper, stopSign, false, fetcher ); - rs = applyNoAggrUpdateFilters( getNoAggrUpdateFilters( executor.getCubeQueryDefinition( ).getFilters( ) ), executor, rs, cube, fetcher ); rs = processOperationOnQuery( view, stopSign, rs, aggrDefns ); break; |