------------------------------------------------------------
revno: 14268
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Mon 2014-03-17 18:39:08 +0100
message:
Trackedentityinstance paging
modified:
dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.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-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-17 17:34:56 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/trackedentity/hibernate/HibernateTrackedEntityInstanceStore.java 2014-03-17 17:39:08 +0000
@@ -122,6 +122,10 @@
public List<Map<String, String>> getTrackedEntityInstances( TrackedEntityInstanceQueryParams params )
{
SqlHelper hlp = new SqlHelper();
+
+ // ---------------------------------------------------------------------
+ // Select clause
+ // ---------------------------------------------------------------------
String sql =
"select tei.uid as " + TRACKED_ENTITY_INSTANCE_ID + ", " +
@@ -138,6 +142,10 @@
}
sql = sql.substring( 0, sql.length() - 2 ); // Remove last comma
+
+ // ---------------------------------------------------------------------
+ // From, join and restriction clause
+ // ---------------------------------------------------------------------
sql +=
"from trackedentityinstance tei " +
@@ -175,9 +183,22 @@
{
sql += hlp.whereAnd() + " tei.organisationunitid in (" + getCommaDelimitedString( getIdentifiers( params.getOrganisationUnits() ) ) + ") ";
}
-
+
+ // ---------------------------------------------------------------------
+ // Paging clause
+ // ---------------------------------------------------------------------
+
+ if ( params.isPaging() )
+ {
+ sql += "limit " + params.getPageSizeWithDefault() + " offset " + params.getOffset();
+ }
+
log.info( "Tracked entity instance query SQL: " + sql );
-
+
+ // ---------------------------------------------------------------------
+ // Query
+ // ---------------------------------------------------------------------
+
SqlRowSet rowSet = jdbcTemplate.queryForRowSet( sql );
List<Map<String, String>> list = new ArrayList<Map<String,String>>();
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
