=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java 2011-09-12 09:13:33 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/model/DataValue.java 2012-02-13 15:21:51 +0000 @@ -43,12 +43,9 @@ // --------------------------------------------------------------------------- public static final String ATTR_DATAELEMENT = "dataElement"; - public static final String ATTR_VALUE = "value"; - public static final String ATTR_CATEGORY_OPTION_COMBO = "categoryOptionCombo"; - - public static final String ATTR_ORGUNIT = "orgunit"; + public static final String ATTR_ORGUNIT = "orgUnit"; @XmlAttribute( name = ATTR_DATAELEMENT, required = true ) private String dataElementIdentifier; @@ -66,13 +63,13 @@ * optional - defaults to orgUnit id from datavalueset */ @XmlAttribute( name = ATTR_ORGUNIT ) - private String orgUnitIdentifier; + private String organisationUnitIdentifier; /** * Arbitrary attributes identifying dimensions by concept name */ @XmlAnyAttribute - Map dimensions; + private Map dimensions; public String getDataElementIdentifier() { @@ -94,6 +91,16 @@ this.categoryOptionComboIdentifier = categoryOptionComboId; } + public String getOrganisationUnitIdentifier() + { + return organisationUnitIdentifier; + } + + public void setOrganisationUnitIdentifier( String organisationUnitIdentifier ) + { + this.organisationUnitIdentifier = organisationUnitIdentifier; + } + public Map getDimensions() { if ( dimensions == null )