dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7593
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2012-07-12 14:39:43 +0200
message:
  Removed data mart from data statistics, times out too often
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm


--
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-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2012-04-23 14:11:27 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/statistics/jdbc/JdbcStatisticsProvider.java	2012-07-12 12:39:43 +0000
@@ -32,7 +32,6 @@
 
 import org.hisp.dhis.common.Objects;
 import org.hisp.dhis.statistics.StatisticsProvider;
-import org.springframework.jdbc.BadSqlGrammarException;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 /**
@@ -74,19 +73,6 @@
         objectCounts.put( Objects.USER, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM users" ) );
         objectCounts.put( Objects.DATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM datavalue" ) );
         
-        try
-        {
-            objectCounts.put( Objects.AGGREGATEDDATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregateddatavalue" ) );
-            objectCounts.put( Objects.AGGREGATEDINDICATORVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedindicatorvalue" ) );
-            objectCounts.put( Objects.AGGREGATEDORGUNITDATAVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedorgunitdatavalue" ) );
-            objectCounts.put( Objects.AGGREGATEDORGUNITINDICATORVALUE, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregatedorgunitindicatorvalue" ) );
-            objectCounts.put( Objects.AGGREGATEDDATASETCOMPLETENESS, jdbcTemplate.queryForInt( "SELECT COUNT(*) FROM aggregateddatasetcompleteness" ) );
-        }
-        catch ( BadSqlGrammarException ex )
-        {
-            // Ignore since tables might be dropped and do not exist
-        }
-        
         return objectCounts;
     }
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm	2012-04-26 18:32:46 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/responseStatistics.vm	2012-07-12 12:39:43 +0000
@@ -53,26 +53,6 @@
         <td>$objects.getValue( "DATAVALUE" )</td>
     </tr>
     <tr>
-        <td>$i18n.getString( "aggregated_data_values" )</td>
-        <td>$objects.getValue( "AGGREGATEDDATAVALUE" )</td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "aggregated_indicator_values" )</td>
-        <td>$objects.getValue( "AGGREGATEDINDICATORVALUE" )</td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "aggregated_org_unit_data_values" )</td>
-        <td>$objects.getValue( "AGGREGATEDORGUNITDATAVALUE" )</td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "aggregated_org_unit_indicator_values" )</td>
-        <td>$objects.getValue( "AGGREGATEDORGUNITINDICATORVALUE" )</td>
-    </tr>
-    <tr>
-        <td>$i18n.getString( "aggregated_data_set_completeness" )</td>
-        <td>$objects.getValue( "AGGREGATEDDATASETCOMPLETENESS" )</td>
-    </tr>
-    <tr>
     	<td colspan="2" style="height:15px"></td>
     </tr>
 </table>