dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16789
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-09-24 09:48:40 +0200
message:
  Analytcs, removed debug code
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.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-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2014-09-24 07:43:19 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java	2014-09-24 07:48:40 +0000
@@ -750,31 +750,6 @@
             aggregationType = AggregationType.fromValue( aggregationOperator );
         }
         
-        //
-        /*
-        if ( AGGREGATION_OPERATOR_AVERAGE_SUM.equals( aggregationOperator ) )
-        {
-            if ( VALUE_TYPE_BOOL.equals( valueType ) )
-            {
-                aggregationType = AVERAGE_BOOL;
-            }
-            else
-            {
-                if ( dataPeriodType == null || aggregationPeriodType == null || aggregationPeriodType.getFrequencyOrder() >= dataPeriodType.getFrequencyOrder() )
-                {
-                    aggregationType = AVERAGE_SUM_INT;
-                }
-                else
-                {
-                    aggregationType = AVERAGE_SUM_INT_DISAGGREGATION;
-                }
-            }
-        }
-        else
-        {
-            aggregationType = AggregationType.fromValue( aggregationOperator );
-        }*/
-        
         return aggregationType;
     }