dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13354
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-12-20 16:05:23 +0100
message:
  Event analytics, fixed issue with case sensitivity
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java
  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/JdbcEventAnalyticsManager.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java	2013-12-06 16:26:51 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/QueryItem.java	2013-12-20 15:05:23 +0000
@@ -112,7 +112,7 @@
             
             for ( String el : split )
             {
-                buffer.append( "'" ).append( el.toString() ).append( "'," );
+                buffer.append( "'" ).append( el ).append( "'," );
             }
             
             return buffer.deleteCharAt( buffer.length() - 1 ).append( ")" ).toString();

=== 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-12-06 15:47:52 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java	2013-12-20 15:05:23 +0000
@@ -129,10 +129,8 @@
     // EventAnalyticsService implementation
     // -------------------------------------------------------------------------
 
-    //TODO order the event analytics tables up front to avoid default sorting in queries
-    //TODO filter items support
+    //TODO order event analytics tables on execution date to avoid default sorting in queries
     //TODO parallel processing of queries
-    //TODO proper query when start/end period or period filter span multiple partitions
     
     public Grid getAggregatedEventData( EventQueryParams params )
     {

=== 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-12-06 15:47:52 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java	2013-12-20 15:05:23 +0000
@@ -409,6 +409,8 @@
     {
         String encodedFilter = statementBuilder.encode( item.getFilter(), false );
         
-        return item.getSqlFilter( encodedFilter );
+        String sqlFilter = item.getSqlFilter( encodedFilter );
+        
+        return item.isNumeric() ? sqlFilter : sqlFilter.toLowerCase();
     }
 }