dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4934
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-10-13 18:28:18 +0200
message:
  Upgraded to quick 1.7. Improves retrieval of aggregated values for mydatamart
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java
  dhis-2/dhis-services/dhis-service-datamart-default/pom.xml
  dhis-2/pom.xml


--
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-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java	2011-10-12 09:23:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java	2011-10-13 16:28:18 +0000
@@ -292,7 +292,7 @@
 
     public StoreIterator<AggregatedDataValue> getAggregatedDataValuesAtLevel( OrganisationUnit rootOrgunit, OrganisationUnitLevel level, Collection<Period> periods )
     {
-        final StatementHolder holder = statementManager.getHolder();
+        final StatementHolder holder = statementManager.getHolder( false );
 
         try
         {
@@ -563,7 +563,7 @@
     @Override
     public StoreIterator<AggregatedIndicatorValue> getAggregatedIndicatorValuesAtLevel(OrganisationUnit rootOrgunit, OrganisationUnitLevel level, Collection<Period> periods)
     {
-        final StatementHolder holder = statementManager.getHolder();
+        final StatementHolder holder = statementManager.getHolder( false );
 
         try
         {

=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/pom.xml'
--- dhis-2/dhis-services/dhis-service-datamart-default/pom.xml	2011-08-28 17:52:59 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/pom.xml	2011-10-13 16:28:18 +0000
@@ -48,6 +48,10 @@
       <groupId>org.amplecode</groupId>
       <artifactId>cave-process</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.amplecode</groupId>
+      <artifactId>quick</artifactId>
+    </dependency>
     
   </dependencies>
   <properties>

=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml	2011-09-30 08:00:12 +0000
+++ dhis-2/pom.xml	2011-10-13 16:28:18 +0000
@@ -42,13 +42,11 @@
   </distributionManagement>
 
   <repositories>
-    <!--
       <repository>
       <id>amplecode_maven2_repo</id>
       <name>AmpleCode Maven 2 repository</name>
       <url>http://www.amplecode.org/maven2</url>
       </repository>
-    -->
     <repository>
       <id>dhis.uio.no</id>
       <name>Dhis2 External Dependencies Repository</name>
@@ -250,6 +248,7 @@
       <dependency>
         <groupId>org.hisp.dhis</groupId>
 
+
         <artifactId>dhis-support-hibernate</artifactId>
         <version>${project.version}</version>
       </dependency>
@@ -409,7 +408,7 @@
       <dependency>
         <groupId>org.amplecode</groupId>
         <artifactId>quick</artifactId>
-        <version>1.6</version>
+        <version>1.7</version>
       </dependency>
       <dependency>
         <groupId>com.lowagie</groupId>