dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01713
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 522: - Fixed bug related to DHIS 1.4 import of datavalues. - Codestyle fix.
------------------------------------------------------------
revno: 522
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-08-31 17:37:16 +0200
message:
- Fixed bug related to DHIS 1.4 import of datavalues. - Codestyle fix.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/CalculatedDataElementRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupMemberRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetMemberRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetOrganisationUnitAssociationRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetMemberRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupMemberRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorTypeRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OnChangePeriodRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupMemberRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/PeriodRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml
dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java
gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.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-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml 2009-06-30 23:08:22 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElement.hbm.xml 2009-08-31 15:37:16 +0000
@@ -17,11 +17,11 @@
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<property name="alternativeName">
- <column name="alternativename" not-null="false" unique="true" length="160"/>
+ <column name="alternativename" not-null="false" unique="true" length="230"/>
</property>
<property name="shortName">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementGroup.hbm.xml 2009-08-31 15:37:16 +0000
@@ -18,7 +18,7 @@
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<set name="members" table="dataelementgroupmembers">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataset/hibernate/DataSet.hbm.xml 2009-08-31 15:37:16 +0000
@@ -9,7 +9,7 @@
<generator class="native"/>
</id>
- <property name="name" not-null="true" unique="true" length="160"/>
+ <property name="name" not-null="true" unique="true" length="230"/>
<property name="shortName" unique="true" length="60"/>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/Indicator.hbm.xml 2009-08-31 15:37:16 +0000
@@ -17,11 +17,11 @@
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<property name="alternativeName">
- <column name="alternativename" not-null="false" unique="true" length="160"/>
+ <column name="alternativename" not-null="false" unique="true" length="230"/>
</property>
<property name="shortName">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/indicator/hibernate/IndicatorGroup.hbm.xml 2009-08-31 15:37:16 +0000
@@ -17,7 +17,7 @@
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<set name="members" table="indicatorgroupmembers">
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml 2009-05-25 10:27:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRule.hbm.xml 2009-08-31 15:37:16 +0000
@@ -10,7 +10,7 @@
</id>
<property name="name">
- <column name="name" not-null="true" unique="true"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<property name="description"/>
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/validation/hibernate/ValidationRuleGroup.hbm.xml 2009-08-31 15:37:16 +0000
@@ -10,7 +10,7 @@
</id>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<property name="description" type="text"/>
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/importer/DefaultDhis14FileImportService.java 2009-08-31 15:37:16 +0000
@@ -48,6 +48,7 @@
import org.hisp.dhis.dataelement.DataElementCategoryOptionComboService;
import org.hisp.dhis.dataelement.DataElementGroup;
import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.datamart.DataMartStore;
import org.hisp.dhis.dataset.DataSet;
import org.hisp.dhis.dataset.DataSetService;
import org.hisp.dhis.datavalue.DataValue;
@@ -232,6 +233,13 @@
this.dataValueService = dataValueService;
}
+ private DataMartStore dataMartStore;
+
+ public void setDataMartStore( DataMartStore dataMartStore )
+ {
+ this.dataMartStore = dataMartStore;
+ }
+
private ImportAnalyser importAnalyser;
public void setImportAnalyser( ImportAnalyser importAnalyser )
@@ -751,6 +759,7 @@
RowHandler rowHandler = new RoutineDataValueRowHandler( batchHandler,
importDataValueBatchHandler,
dataValueService,
+ dataMartStore,
objectMappingGenerator.getDataElementMapping( params.skipMapping() ),
objectMappingGenerator.getPeriodMapping( params.skipMapping() ),
objectMappingGenerator.getOrganisationUnitMapping( params.skipMapping() ),
@@ -819,6 +828,7 @@
RowHandler rowHandler = new SemiPermanentDataValueRowHandler( batchHandler,
importDataValueBatchHandler,
dataValueService,
+ dataMartStore,
objectMappingGenerator.getDataElementMapping( params.skipMapping() ),
objectMappingGenerator.getPeriodObjectMapping( params.skipMapping() ),
objectMappingGenerator.getOrganisationUnitMapping( params.skipMapping() ),
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/CalculatedDataElementRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/CalculatedDataElementRowHandler.java 2009-04-02 07:50:49 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/CalculatedDataElementRowHandler.java 2009-08-31 15:37:16 +0000
@@ -91,7 +91,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupMemberRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupMemberRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupMemberRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java 2009-08-31 15:37:16 +0000
@@ -64,7 +64,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java 2009-08-31 15:37:16 +0000
@@ -72,7 +72,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetMemberRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetMemberRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetMemberRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetOrganisationUnitAssociationRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetOrganisationUnitAssociationRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetOrganisationUnitAssociationRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataSetRowHandler.java 2009-08-31 15:37:16 +0000
@@ -72,7 +72,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetMemberRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetMemberRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetMemberRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/GroupSetRowHandler.java 2009-08-31 15:37:16 +0000
@@ -63,7 +63,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupMemberRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupMemberRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupMemberRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java 2009-08-31 15:37:16 +0000
@@ -64,7 +64,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java 2009-08-31 15:37:16 +0000
@@ -89,7 +89,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorTypeRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorTypeRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorTypeRowHandler.java 2009-08-31 15:37:16 +0000
@@ -63,7 +63,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OnChangePeriodRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OnChangePeriodRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OnChangePeriodRowHandler.java 2009-08-31 15:37:16 +0000
@@ -70,7 +70,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupMemberRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupMemberRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupMemberRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java 2009-08-31 15:37:16 +0000
@@ -64,7 +64,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRelationshipRowHandler.java 2009-08-31 15:37:16 +0000
@@ -71,7 +71,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java 2009-08-31 15:37:16 +0000
@@ -70,7 +70,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/PeriodRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/PeriodRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/PeriodRowHandler.java 2009-08-31 15:37:16 +0000
@@ -75,7 +75,7 @@
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/RoutineDataValueRowHandler.java 2009-08-31 15:37:16 +0000
@@ -32,6 +32,7 @@
import org.amplecode.quick.BatchHandler;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.datamart.DataMartStore;
import org.hisp.dhis.datavalue.DataValue;
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.importexport.GroupMemberType;
@@ -60,13 +61,13 @@
private DataElementCategoryOptionCombo categoryOptionCombo;
- private DataElement element = new DataElement();
-
- private Period period = new Period();
-
- private Source source = new OrganisationUnit();
-
- private DataValue value = new DataValue();
+ private DataElement element;
+
+ private Period period;
+
+ private Source source;
+
+ private DataValue value;
// -------------------------------------------------------------------------
// Constructor
@@ -75,6 +76,7 @@
public RoutineDataValueRowHandler( BatchHandler<DataValue> batchHandler,
BatchHandler<ImportDataValue> importDataValueBatchHandler,
DataValueService dataValueService,
+ DataMartStore dataMartStore,
Map<Object, Integer> dataElementMapping,
Map<Object, Integer> periodMapping,
Map<Object, Integer> organisationUnitMapping,
@@ -84,15 +86,21 @@
this.batchHandler = batchHandler;
this.importDataValueBatchHandler = importDataValueBatchHandler;
this.dataValueService = dataValueService;
+ this.dataMartStore = dataMartStore;
this.dataElementMapping = dataElementMapping;
this.periodMapping = periodMapping;
this.organisationUnitMapping = organisationUnitMapping;
this.categoryOptionCombo = categoryOptionCombo;
this.params = params;
+
+ this.element = new DataElement();
+ this.period = new Period();
+ this.source = new OrganisationUnit();
+ this.value = new DataValue();
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java 2009-08-12 21:06:37 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/SemiPermanentDataValueRowHandler.java 2009-08-31 15:37:16 +0000
@@ -32,6 +32,7 @@
import org.amplecode.quick.BatchHandler;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.datamart.DataMartStore;
import org.hisp.dhis.datavalue.DataValue;
import org.hisp.dhis.datavalue.DataValueService;
import org.hisp.dhis.importexport.GroupMemberType;
@@ -60,11 +61,11 @@
private DataElementCategoryOptionCombo categoryOptionCombo;
- private DataElement element = new DataElement();
+ private DataElement element;
- private Source source = new OrganisationUnit();
+ private Source source;
- private DataValue value = new DataValue();
+ private DataValue value;
// -------------------------------------------------------------------------
// Constructor
@@ -73,6 +74,7 @@
public SemiPermanentDataValueRowHandler( BatchHandler<DataValue> batchHandler,
BatchHandler<ImportDataValue> importDataValueBatchHandler,
DataValueService dataValueService,
+ DataMartStore dataMartStore,
Map<Object, Integer> dataElementMapping,
Map<Period, Integer> periodMapping,
Map<Object, Integer> organisationUnitMapping,
@@ -82,15 +84,20 @@
this.batchHandler = batchHandler;
this.importDataValueBatchHandler = importDataValueBatchHandler;
this.dataValueService = dataValueService;
+ this.dataMartStore = dataMartStore;
this.dataElementMapping = dataElementMapping;
this.periodMapping = periodMapping;
this.organisationUnitMapping = organisationUnitMapping;
this.categoryOptionCombo = categoryOptionCombo;
this.params = params;
+
+ this.element = new DataElement();
+ this.source = new OrganisationUnit();
+ this.value = new DataValue();
}
// -------------------------------------------------------------------------
- // BatchRowHandler implementation
+ // RowHandler implementation
// -------------------------------------------------------------------------
public void handleRow( Object object )
@@ -113,7 +120,7 @@
value.setSource( source );
value.setValue( String.valueOf( dhis14Value.getValue() ) );
value.setComment( dhis14Value.getComment() );
-
+
if ( value.getDataElement() != null && value.getPeriod() != null && value.getSource() != null && value.getValue() != null )
{
read( value, GroupMemberType.NONE, params );
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2009-08-09 12:33:08 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2009-08-31 15:37:16 +0000
@@ -246,6 +246,8 @@
ref="org.hisp.dhis.indicator.IndicatorService"/>
<property name="dataValueService"
ref="org.hisp.dhis.datavalue.DataValueService"/>
+ <property name="dataMartStore"
+ ref="org.hisp.dhis.datamart.DataMartStore"/>
<property name="importAnalyser"
ref="org.hisp.dhis.importexport.analysis.ImportAnalyser"/>
<property name="cacheManager"
=== modified file 'dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml'
--- dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml 2009-06-28 15:32:51 +0000
+++ dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnit.hbm.xml 2009-08-31 15:37:16 +0000
@@ -14,7 +14,7 @@
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<set name="children" inverse="true" cascade="save-update,delete-orphan">
=== modified file 'dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroup.hbm.xml 2009-08-31 15:37:16 +0000
@@ -14,7 +14,7 @@
</property>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<set name="members" table="orgunitgroupmembers">
=== modified file 'dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml'
--- dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-services/dhis-service-organisationunit/src/main/resources/org/hisp/dhis/organisationunit/hibernate/OrganisationUnitGroupSet.hbm.xml 2009-08-31 15:37:16 +0000
@@ -10,7 +10,7 @@
</id>
<property name="name">
- <column name="name" not-null="true" unique="true" length="160"/>
+ <column name="name" not-null="true" unique="true" length="230"/>
</property>
<property name="description"/>
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java 2009-08-21 08:34:37 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapSourceTypeUserSettingAction.java 2009-08-31 15:37:16 +0000
@@ -1,5 +1,32 @@
package org.hisp.dhis.mapping.action;
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
import static org.hisp.dhis.mapping.MappingService.KEY_MAP_SOURCE_TYPE;
import static org.hisp.dhis.mapping.MappingService.MAP_SOURCE_TYPE_DATABASE;
@@ -7,6 +34,10 @@
import com.opensymphony.xwork2.Action;
+/**
+ * @author Jan Henrik Overland
+ * @version $Id$
+ */
public class GetMapSourceTypeUserSettingAction
implements Action
{
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java 2009-08-21 08:34:37 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/GetMapsByTypeAction.java 2009-08-31 15:37:16 +0000
@@ -1,5 +1,32 @@
package org.hisp.dhis.mapping.action;
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
import java.util.Collection;
import org.hisp.dhis.mapping.Map;
@@ -7,6 +34,10 @@
import com.opensymphony.xwork2.Action;
+/**
+ * @author Jan Henrik Overland
+ * @version $Id$
+ */
public class GetMapsByTypeAction
implements Action
{
=== modified file 'gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java'
--- gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java 2009-08-21 08:34:37 +0000
+++ gis/dhis-web-mapping/src/main/java/org/hisp/dhis/mapping/action/SetMapSourceTypeUserSettingAction.java 2009-08-31 15:37:16 +0000
@@ -1,11 +1,42 @@
package org.hisp.dhis.mapping.action;
+/*
+ * Copyright (c) 2004-2007, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
import static org.hisp.dhis.mapping.MappingService.KEY_MAP_SOURCE_TYPE;
import org.hisp.dhis.user.UserSettingService;
import com.opensymphony.xwork2.Action;
+/**
+ * @author Jan Henrik Overland
+ * @version $Id$
+ */
public class SetMapSourceTypeUserSettingAction
implements Action
{
Follow ups
