=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-09-11 20:04:18 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2013-09-25 09:18:11 +0000 @@ -211,7 +211,7 @@ { params.getItems().add( new QueryItem( getItem( it, pr ) ) ); } - else if ( it != null ) + else if ( it != null ) // Filter { String[] split = it.split( OPTION_SEP ); === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2013-09-11 20:04:18 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java 2013-09-25 09:18:11 +0000 @@ -219,19 +219,20 @@ return null; } - filter = statementBuilder.encode( filter, false ); + operator = operator.toLowerCase(); + filter = statementBuilder.encode( filter, false ).toLowerCase(); if ( operator.equals( "like" ) ) { - return "'%" + filter.toLowerCase() + "%'"; + return "'%" + filter + "%'"; } else if ( operator.equals( "in" ) ) { - String[] split = filter.toLowerCase().split( ":" ); + String[] split = filter.split( ":" ); return "(" + TextUtils.getQuotedCommaDelimitedString( Arrays.asList( split ) ) + ")"; } - return "'" + filter.toLowerCase() + "'"; + return "'" + filter + "'"; } }