dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2285
committer: Bob Jolliffe bobjolliffe@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2010-09-30 12:21:51 +0100
message:
  Dealing with backward compatibility with dxf minor versions
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.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/DataElementCategoryConverter.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java	2010-09-17 21:30:59 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementCategoryConverter.java	2010-09-30 11:21:51 +0000
@@ -60,6 +60,7 @@
     private static final String FIELD_ID = "id";
     private static final String FIELD_NAME = "name";
     private static final String FIELD_CONCEPT_ID = "conceptid";
+    private static final String FIELD_CONCEPT_NAME = "conceptname"; //deprecated 1.2
 
     private ConceptService conceptService;
 
@@ -146,9 +147,7 @@
             } else if (params.getMinorVersion().equals( MINOR_VERSION_11))
             {
                 log.debug("reading category dxf version 1.1");
-                // this version had conceptname as a string
-                // we'll just lose it for now :-(
-                // TODO: fix this
+                // TODO: read concept from conceptname
                 category.setConcept(defaultConcept);
             } else
             {