dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 680
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Fri 2009-09-11 19:26:52 +0200
message:
  Fixed bug related to export of datasetmembers.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java
  dhis-live/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-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java	2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetMemberConverter.java	2009-09-11 17:26:52 +0000
@@ -108,6 +108,8 @@
         Collection<DataSet> dataSets = dataSetService.getDataSets( params.getDataSets() );
         
         Collection<DataElement> elements = dataElementService.getDataElements( params.getAllDataElements() );
+        System.out.println( "datasets " + dataSets.size() );
+        System.out.println( "dataelmts " + elements.size() );
         
         if ( dataSets != null && dataSets.size() > 0 && elements != null && elements.size() > 0 )
         {
@@ -119,7 +121,7 @@
                 {
                     for ( DataElement element : dataSet.getDataElements() )
                     {
-                        if ( params.getDataElements() != null && params.getDataElements().contains( element ) )
+                        if ( elements.contains( element ) )
                         {
                             writer.openElement( ELEMENT_NAME );
                             

=== modified file 'dhis-live/pom.xml'
--- dhis-live/pom.xml	2009-09-11 16:47:31 +0000
+++ dhis-live/pom.xml	2009-09-11 17:26:52 +0000
@@ -1,4 +1,7 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";>
+  
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.hisp.dhis</groupId>
   <artifactId>dhis-live</artifactId>
@@ -9,6 +12,7 @@
   <url>http://maven.apache.org</url>
   
   <build>
+    <finalName>dhis2-live</finalName>
     <defaultGoal>install</defaultGoal>
     <plugins>
       <plugin>