From 593defddfdc4b2c78e0ffd66ed1f16efdf458467 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 6 Jul 2020 15:53:35 +0200 Subject: [PATCH] ref #9041, ref #9049, ref #8996 add create report to Fl. Uzbekistan imports --- .../app/uzbekistan/UzbekistanAltitudeActivator.java | 4 +++- .../app/uzbekistan/UzbekistanHabitatActivator.java | 11 ++++++----- .../cdm/app/uzbekistan/UzbekistanTaxonActivator.java | 4 +++- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanAltitudeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanAltitudeActivator.java index 265a2c6d..a02461f0 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanAltitudeActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanAltitudeActivator.java @@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; +import eu.etaxonomy.cdm.io.common.ImportResult; import eu.etaxonomy.cdm.io.fact.altitude.in.AltitudeExcelImportConfigurator; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.reference.Reference; @@ -72,7 +73,8 @@ public class UzbekistanAltitudeActivator { config.setMaxColumnLabel("высота макс"); CdmDefaultImport myImport = new CdmDefaultImport<>(); - myImport.invoke(config); + ImportResult result = myImport.invoke(config); + System.out.println(result.createReport()); } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanHabitatActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanHabitatActivator.java index 5a4137fe..630701c3 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanHabitatActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanHabitatActivator.java @@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; +import eu.etaxonomy.cdm.io.common.ImportResult; import eu.etaxonomy.cdm.io.fact.categorical.in.CategoricalDataExcelImportConfigurator; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.reference.Reference; @@ -29,7 +30,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceFactory; * * Import for Flora of Uzbekistan habitats. * - * https://dev.e-taxonomy.eu/redmine/issues/9041 + * https://dev.e-taxonomy.eu/redmine/issues/9049 * * @author a.mueller * @since 28.05.2020 @@ -41,10 +42,9 @@ public class UzbekistanHabitatActivator { //database validation status (create, update, validate ...) - static final ICdmDataSource cdmDestination = CdmDestinations.localH2(); -// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_cdmtest_mysql(); +// static final ICdmDataSource cdmDestination = CdmDestinations.localH2(); // static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_uzbekistan(); -// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_uzbekistan(); + static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_uzbekistan(); static DbSchemaValidation hbm2dll = cdmDestination.getDatabaseType() == DatabaseTypeEnum.H2 ? DbSchemaValidation.CREATE : DbSchemaValidation.VALIDATE; @@ -74,7 +74,8 @@ public class UzbekistanHabitatActivator { config.setSourceReference(getSourceReference()); CdmDefaultImport myImport = new CdmDefaultImport<>(); - myImport.invoke(config); + ImportResult result = myImport.invoke(config); + System.out.println(result.createReport()); } diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanTaxonActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanTaxonActivator.java index 230132df..0e74029d 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanTaxonActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/uzbekistan/UzbekistanTaxonActivator.java @@ -19,6 +19,7 @@ import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.CdmDefaultImport; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; +import eu.etaxonomy.cdm.io.common.ImportResult; import eu.etaxonomy.cdm.io.uzbekistan.UzbekistanTaxonImportConfigurator; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.agent.Team; @@ -77,7 +78,8 @@ public class UzbekistanTaxonActivator { config.setSourceReference(getSourceReference()); CdmDefaultImport myImport = new CdmDefaultImport<>(); - myImport.invoke(config); + ImportResult result = myImport.invoke(config); + System.out.println(result.createReport()); } -- 2.34.1