Query Execution Profile's Filter Expression displays wrong custom filter

operator(T51660)
eclipse-birt · Nov 16, 2012 · 7410166 · 7410166
1 parent e6aef48
commit 7410166
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/...data.adapter/src/org/eclipse/birt/report/data/adapter/internal/adapter/FilterAdapter.java b/...data.adapter/src/org/eclipse/birt/report/data/adapter/internal/adapter/FilterAdapter.java
@@ -110,8 +110,23 @@ public FilterAdapter( IModelAdapter adapter,  FilterConditionHandle modelFilter,
 		String filterExpr = modelFilter.getExpr( );
 		if ( filterExpr != null )
 		{
+			String filterOpr = null;
 			// convert to DtE exprFilter if there is no operator
-			String filterOpr = modelFilter.getOperator( );
+			if ( filterDefn != null )
+			{
+				if ( filterDefn.getBirtFilterExprId( ) != null )
+				{
+					filterOpr = modelFilter.getOperator( );
+				}
+				else if ( filterDefn.getExtFilterExprId( ) != null )
+				{
+					filterOpr = filterDefn.getExtFilterExprId( );
+				}
+			}
+			if( filterOpr == null )
+			{
+				filterOpr = modelFilter.getOperator( );
+			}
 			if ( filterOpr == null || filterOpr.length( ) == 0 )
 			{
 				// Standalone expression; data type must be boolean