=== modified file 'dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java	2010-09-18 12:12:39 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/databrowser/jdbc/StatementManagerDataBrowserStore.java	2010-11-12 15:49:36 +0000
@@ -395,7 +395,7 @@
 
             sqlsb.append( "(SELECT de.dataelementid, de.name AS DataElement, Count(dv.value) AS counts_of_aggregated_values, p.periodid AS PeriodId, p.startDate AS ColumnHeader " );
             sqlsb.append( "FROM dataelement de JOIN datavalue dv ON (de.dataelementid = dv.dataelementid) " );
-            sqlsb.append( "JOIN datasetmembers dsm ON (de.dataelementid = dsm.dataelementid) " );
+
             sqlsb.append( "JOIN period p ON (dv.periodid = p.periodid) " );
             sqlsb.append( "WHERE dsm.datasetid = '" + dataSetId + "' AND dv.periodid = '" + periodId + "' " );
             sqlsb.append( "GROUP BY de.dataelementid, de.name, p.periodid, p.startDate)" );
@@ -581,7 +581,6 @@
             sqlsb.append( "(SELECT de.dataelementid, de.name AS DataElement, Count(dv.value) AS counts_of_aggregated_values, p.periodid AS PeriodId, p.startDate AS ColumnHeader " );
             sqlsb.append( "FROM dataelement AS de " );
             sqlsb.append( "INNER JOIN datavalue AS dv ON (de.dataelementid = dv.dataelementid) " );
-            sqlsb.append( "INNER JOIN datasetmembers AS dsm ON (de.dataelementid = dsm.dataelementid) " );
             sqlsb.append( "INNER JOIN organisationunit As o ON (dv.sourceid = o.organisationunitid) " );
             sqlsb.append( "JOIN period p ON (dv.periodid = p.periodid) " );
             sqlsb.append( "WHERE o.organisationunitid = '" + orgUnitId + "' " );
@@ -677,30 +676,31 @@
             /**
              * The current organization unit
              */
-            sb.append( "SELECT DISTINCT o.organisationunitid AS parentid, o.name AS OrganisationUnit, COUNT(value) as countdv_descendants, p.periodid AS PeriodId, p.startDate AS ColumnHeader " );
-            sb.append( "FROM organisationunit o " );
-            sb.append( "JOIN datavalue dv ON ( dv.sourceid = o.organisationunitid ) " );
-            sb.append( "JOIN period p ON ( p.periodid = dv.periodid ) " );
-            sb.append( "WHERE o.parentid = '" + orgUnitSelected + "' " );
-            sb.append( "AND dv.periodid = '" + periodid + "' " );
-            sb.append( "GROUP BY o.organisationunitid, OrganisationUnit, p.periodid, p.startdate " );
-            sb.append( "UNION " );
+            sb.append( "SELECT DISTINCT o.organisationunitid AS parentid, o.name AS OrganisationUnit, COUNT(value)"
+                    + " as countdv_descendants, p.periodid AS PeriodId, p.startDate AS ColumnHeader " );
+            sb.append( " FROM organisationunit o " );
+            sb.append( " JOIN datavalue dv ON ( dv.sourceid = o.organisationunitid ) " );
+            sb.append( " JOIN period p ON ( p.periodid = dv.periodid ) " );
+            sb.append( " WHERE o.parentid = '" + orgUnitSelected + "' " );
+            sb.append( " AND dv.periodid = '" + periodid + "' " );
+            sb.append( " GROUP BY o.organisationunitid, OrganisationUnit, p.periodid, p.startdate " );
+            sb.append( " UNION " );
 
             /**
              * All descendant levels of selected organization unit
              */
-            sb.append( "SELECT DISTINCT ou" + orgIndex + ".organisationunitid AS parentid, ou" + orgIndex + ".name AS OrganisationUnit, COUNT(value) as countdv_descendants, p.periodid AS PeriodId, p.startDate AS ColumnHeader " );
-            sb.append( "FROM datavalue dv " );
-            sb.append( "JOIN organisationunit ou ON ( ou.organisationunitid = dv.sourceid ) " );
-            this.setUpQueryForJOINTable( sb, diffLevel );
-            sb.append( "JOIN period p ON ( p.periodid = dv.periodid ) " );
-            sb.append( "WHERE dv.periodid = '" + periodid + "' " );
-            sb.append( "AND dv.sourceid IN " );
-            sb.append( "( " );
+            sb.append("SELECT a.parentid, ou.name as organisationunit, COUNT(dv.value), p.periodid, p.startdate ");
+            sb.append(" FROM datavalue dv ");
+            sb.append(" INNER JOIN ( ");
             sb.append( this.setUpQueryGetDescendants( curLevel, maxLevel, orgUnitSelected ) );
-            sb.append( " ) " );
-            sb.append( "GROUP BY ou" + orgIndex + ".organisationunitid, OrganisationUnit, p.periodid, p.startDate " );
-            
+            sb.append(" ) a");
+            sb.append(" on a.childid = dv.sourceid ");
+            sb.append(" INNER JOIN organisationunit ou ON a.parentid = ou.organisationunitid ");
+            sb.append(" INNER JOIN period p on p.periodid = ");
+            sb.append(periodid);
+            sb.append(" WHERE dv.periodid = ");
+            sb.append(periodid);
+            sb.append(" GROUP BY a.parentid, ou.name, p.periodid, p.startdate ");
             sb.append( i < loopSize ? "UNION " : "" );
            
         }
@@ -708,18 +708,34 @@
 
     private String setUpQueryGetDescendants( int curLevel, int maxLevel, Integer orgUnitSelected )
     {
-        int j = curLevel;
+        Integer j = curLevel;
+        Integer nextLevel = j +1;
+        Integer parentLevel = curLevel;
 
-        String oldSQL = "SELECT DISTINCT idlevel" + (j + 1) + " FROM _orgunitstructure os WHERE os.idlevel" + (j)
-            + " = '" + orgUnitSelected + "'";
+        StringBuffer desc_query = new StringBuffer( "SELECT DISTINCT idlevel");
+        desc_query.append(nextLevel.toString());
+        desc_query.append( "  as parentid, idlevel");
+        desc_query.append(nextLevel.toString());
+        desc_query.append( " as childid from _orgunitstructure where idlevel");
+        desc_query.append(parentLevel.toString());
+        desc_query.append( " = '");
+        desc_query.append(orgUnitSelected.toString());
+        desc_query.append("'");
 
         for ( j++; j < (maxLevel); j++ )
-        {
-            oldSQL = "SELECT DISTINCT idlevel" + (j + 1) + " as descendant FROM _orgunitstructure os WHERE idlevel"
-                + (j) + " IN ( " + oldSQL + " ) ";
+        {   desc_query.append( " UNION " );
+            desc_query.append( "SELECT DISTINCT idlevel");
+            desc_query.append(nextLevel.toString());
+            desc_query.append( "  as parentid, idlevel");
+            desc_query.append(j.toString());
+            desc_query.append( " as childid from _orgunitstructure where idlevel");
+            desc_query.append(parentLevel.toString());
+            desc_query.append( " = '");
+            desc_query.append(orgUnitSelected.toString());
+            desc_query.append("'");
         }
-
-        return oldSQL;
+         
+        return desc_query.toString();
     }
 
     private void setUpQueryForDrillDownViewTable( StringBuffer sb )