------------------------------------------------------------ revno: 6815 committer: Lars Helge Overland <larshe...@gmail.com> branch nick: dhis2 timestamp: Mon 2012-04-30 20:41:52 +0200 message: Fixed error prone fix in import modified: dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.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/dxf/converter/DataDictionaryConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataDictionaryConverter.java 2012-04-30 18:41:52 +0000 @@ -125,14 +125,8 @@ final DataDictionary dictionary = new DataDictionary(); dictionary.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - - if (params.minorVersionGreaterOrEqual( "1.3") ) { - reader.moveToStartElement( FIELD_UID ); - dictionary.setUid( reader.getElementValue() ); - reader.moveToStartElement( FIELD_CODE ); - dictionary.setCode( reader.getElementValue() ); - } - + dictionary.setUid( values.get( FIELD_UID ) ); + dictionary.setCode( values.get( FIELD_CODE ) ); dictionary.setName( values.get( FIELD_NAME ) ); dictionary.setDescription( values.get( FIELD_DESCRIPTION ) ); dictionary.setRegion( values.get( FIELD_REGION ) );
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp