dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1289
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Sat 2009-12-26 00:39:39 +0100
message:
  Minor fix
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.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-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java	2009-11-23 12:12:51 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java	2009-12-25 23:39:39 +0000
@@ -83,7 +83,7 @@
         final Integer parentId = organisationUnitMapping.get( dhis14Association.getGroupId() );
         final Integer childId = organisationUnitMapping.get( dhis14Association.getMemberId() );
         
-        if ( parentId != null && childId != null && parentId.equals( childId ) ) // Parent id equals child id for root
+        if ( parentId != null && childId != null && !parentId.equals( childId ) ) // Parent id equals child id for root
         {
             association.setGroupId( parentId );
             association.setMemberId( childId );

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java	2009-11-23 17:27:52 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitHierarchyConverter.java	2009-12-25 23:39:39 +0000
@@ -139,7 +139,7 @@
         Integer parentId = organisationUnitMapping.get( Integer.parseInt( values.get( FIELD_PARENT ) ) );
         Integer childId = organisationUnitMapping.get( Integer.parseInt( values.get( FIELD_CHILD ) ) );
         
-        if ( parentId != null && childId != null && parentId.equals( childId ) ) // Parent id equals child id for root
+        if ( parentId != null && childId != null && !parentId.equals( childId ) ) // Parent id equals child id for root
         {
             association.setGroupId( parentId );
             association.setMemberId( childId );