------------------------------------------------------------
revno: 88
committer: Lars Helge Oeverland [email protected]
branch nick: dhis2
timestamp: Thu 2009-03-19 15:31:44 +0100
message:
dhis-service-importexport: Fixed a few minor bugs related to DHIS 1.4 xml and
IXF import
modified:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorTypeConverter.java
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/PeriodConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/SourceConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/TimePeriodConverter.java
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java
=== modified file
'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java'
---
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java
2009-03-09 14:11:42 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorConverter.java
2009-03-19 14:31:44 +0000
@@ -93,8 +93,6 @@
// Properties
//
-------------------------------------------------------------------------
- private IndicatorService indicatorService;
-
private Map<Object, Integer> indicatorTypeMapping;
private Map<Object, Integer> dataElementMapping;
private Map<Object, String> dataElementAggregationOperatorMap;
=== modified file
'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorTypeConverter.java'
---
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorTypeConverter.java
2009-03-09 14:11:42 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/IndicatorTypeConverter.java
2009-03-19 14:31:44 +0000
@@ -54,8 +54,6 @@
private static final String FIELD_NAME = "IndicatorTypeName";
private static final String FIELD_FACTOR = "Factor";
- private IndicatorService indicatorService;
-
//
-------------------------------------------------------------------------
// Constructor
//
-------------------------------------------------------------------------
=== 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
2009-03-09 14:11:42 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/OrganisationUnitConverter.java
2009-03-19 14:31:44 +0000
@@ -68,8 +68,6 @@
private static final int VALID_FROM = 34335;
private static final int VALID_TO = 2958465;
- private OrganisationUnitService organisationUnitService;
-
//
-------------------------------------------------------------------------
// Constructor
//
-------------------------------------------------------------------------
=== modified file
'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/PeriodConverter.java'
---
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/PeriodConverter.java
2009-03-09 14:11:42 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/converter/PeriodConverter.java
2009-03-19 14:31:44 +0000
@@ -59,8 +59,6 @@
private static final String FIELD_START_DATE = "ValidFrom";
private static final String FIELD_END_DATE = "ValidTo";
- private PeriodService periodService;
-
private Map<String, Integer> periodTypeMapping;
//
-------------------------------------------------------------------------
=== modified file
'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/SourceConverter.java'
---
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/SourceConverter.java
2009-03-09 12:11:46 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/SourceConverter.java
2009-03-19 14:31:44 +0000
@@ -57,8 +57,6 @@
private static final String FIELD_ORG = "org";
private static final String FIELD_KEY = "key";
- private OrganisationUnitService organisationUnitService;
-
//
-------------------------------------------------------------------------
// Constructor
//
-------------------------------------------------------------------------
=== modified file
'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/TimePeriodConverter.java'
---
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/TimePeriodConverter.java
2009-03-09 12:11:46 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/converter/TimePeriodConverter.java
2009-03-19 14:31:44 +0000
@@ -60,8 +60,6 @@
// Properties
//
-------------------------------------------------------------------------
- private PeriodService periodService;
-
private Map<String, Integer> periodTypeMapping;
//
-------------------------------------------------------------------------
=== modified file
'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java'
---
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java
2009-03-03 16:46:36 +0000
+++
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java
2009-03-19 14:31:44 +0000
@@ -35,7 +35,7 @@
{
ImportParams params = new ImportParams();
- params.setType( ImportType.IMPORT );
+ params.setType( ImportType.PREVIEW );
params.setDataValues( true );
params.setExtendedMode( false );
params.setSkipCheckMatching( false );
--
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.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
