[Automation][OS 421] Result is incorrect when add filter on xtab andv201209121213

uncheck "Recalculate Totals" [53138]

1 files changed, 0 insertions, 67 deletions

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 21a3cce..e9fd18f 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
@@ -288,72 +288,6 @@ public class QueryExecutor
 		return new CubeResultSet( rs, view, cubeQueryExecutorHelper );
 	}
 	
-	private IBinding getBinding( String bindingName, List bindings ) throws DataException
-	{
-		for( int j = 0; j < bindings.size( ); j++ )
-		{
-			IBinding binding = (IBinding) bindings.get( j );
-			if( bindingName.equals( binding.getBindingName( ) ) )
-			{
-				return binding;
-			}
-		}
-		return null;
-	}
-	
-	private void replaceFilterTextOnCalculateMeasures( IFilterDefinition filter, List bindings ) throws DataException
-	{
-		if( filter.getExpression( ) instanceof ConditionalExpression )
-		{
-			ConditionalExpression filterExpr = (ConditionalExpression) filter.getExpression( );
-			List referenceBindingName = ExpressionCompilerUtil.extractColumnExpression( filterExpr.getExpression( ),
-					ScriptConstants.DATA_BINDING_SCRIPTABLE );
-			if ( referenceBindingName.size( ) > 0 )
-			{
-				for ( int i = 0; i < referenceBindingName.size( ); i++ )
-				{
-					IBinding binding = getBinding( referenceBindingName.get( i )
-							.toString( ), bindings );
-					if ( binding != null )
-					{
-						( (ScriptExpression) filterExpr.getExpression( ) ).setText( ( (ScriptExpression) binding.getExpression( ) ).getText( ) );
-					}
-				}
-
-			}
-			
-			referenceBindingName = ExpressionCompilerUtil.extractColumnExpression( filterExpr.getOperand1( ),
-					ScriptConstants.DATA_BINDING_SCRIPTABLE );
-			if ( referenceBindingName.size( ) > 0 )
-			{
-				for ( int i = 0; i < referenceBindingName.size( ); i++ )
-				{
-					IBinding binding = getBinding( referenceBindingName.get( i )
-							.toString( ), bindings );
-					if ( binding != null )
-					{
-						( (ScriptExpression) filterExpr.getOperand1( ) ).setText( ( (ScriptExpression) binding.getExpression( ) ).getText( ) );
-					}
-				}
-			}
-			
-			referenceBindingName = ExpressionCompilerUtil.extractColumnExpression( filterExpr.getOperand2( ),
-					ScriptConstants.DATA_BINDING_SCRIPTABLE );
-			if ( referenceBindingName.size( ) > 0 )
-			{
-				for ( int i = 0; i < referenceBindingName.size( ); i++ )
-				{
-					IBinding binding = getBinding( referenceBindingName.get( i )
-							.toString( ), bindings );
-					if ( binding != null )
-					{
-						( (ScriptExpression) filterExpr.getOperand2( ) ).setText( ( (ScriptExpression) binding.getExpression( ) ).getText( ) );
-					}
-				}
-			}
-		}
-	}
-	
 	private IAggregationResultSet[] applyNoAggrUpdateFilters ( List finalFilters, CubeQueryExecutor executor , IAggregationResultSet[] rs , ICube cube, IBindingValueFetcher fetcher,boolean fromCubeOperation ) throws DataException, IOException
 	{
 		if( !finalFilters.isEmpty( ) )
@@ -404,7 +338,6 @@ public class QueryExecutor
 				}
 				else if ( type == executor.AGGR_MEASURE_FILTER )
 				{
-					replaceFilterTextOnCalculateMeasures ( filter, executor.getCubeQueryDefinition( ).getBindings( ) );
 					aggrEvalList.add( new AggrMeasureFilterEvalHelper( executor.getOuterResults( ),
 							executor.getScope( ),
 							executor.getCubeQueryDefinition( ),