dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 5193
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-11-22 13:46:08 +0100
message:
  Ignoring org unit code in 1.4 import
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitConverter.java
  dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.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/dhis14/xml/converter/OrganisationUnitConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitConverter.java	2011-04-22 13:43:13 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitConverter.java	2011-11-22 12:46:08 +0000
@@ -143,7 +143,6 @@
         unit.setShortName( values.get( FIELD_SHORT_NAME ) );
         unit.setOpeningDate(   Dhis14DateUtil.getDate( Integer.parseInt( values.get( FIELD_VALID_FROM ) ) ) );
         unit.setClosedDate( Dhis14DateUtil.getDate( Integer.parseInt( values.get( FIELD_VALID_TO ) ) ) );
-        unit.setCode( values.get( FIELD_CODE ) );
         unit.setActive( convertBooleanFromDhis14(values.get( FIELD_ACTIVE ) ) ) ;
         unit.setComment( values.get( FIELD_COMMENT ) );
         unit.setLastUpdated( Dhis14DateUtil.getDate( values.get( FIELD_LAST_UPDATED ) ) );

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml	2010-03-09 13:10:43 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/sqlmap/organisationUnit.sqlmap.xml	2011-11-22 12:46:08 +0000
@@ -18,7 +18,6 @@
         <result property="id" column="OrgUnitID"/>
         <result property="name" column="OrgUnitName"/>
         <result property="shortName" column="OrgUnitShort"/>
-        <result property="code" column="OrgUnitCode"/>
         <result property="openingDate" column="ValidFrom" typeHandler="dateTypeHandler"/>
         <result property="active" column="Active" typeHandler="booleanTypeHandler"/>
         <result property="comment" column="Comment"/>