X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib-apps.git/blobdiff_plain/dc589373b1043f3dacca6f591c7487629908d6c1..15a41eb543b7730ce879db8d89af1fa5d461ed77:/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java
index 0a853061..4447d621 100644
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java
@@ -9,37 +9,30 @@
 
 package eu.etaxonomy.cdm.app.berlinModelImport;
 
-import java.io.File;
 import java.util.UUID;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.api.application.CdmApplicationController;
-import eu.etaxonomy.cdm.app.berlinModelImport.BerlinModelSources;
-import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator;
+import eu.etaxonomy.cdm.api.application.ICdmApplicationDefaultConfiguration;
 import eu.etaxonomy.cdm.app.common.CdmDestinations;
-import eu.etaxonomy.cdm.app.images.ImageImportConfigurator;
+import eu.etaxonomy.cdm.app.berlinModelImport.TreeCreator;
 import eu.etaxonomy.cdm.database.DbSchemaValidation;
 import eu.etaxonomy.cdm.database.ICdmDataSource;
-import eu.etaxonomy.cdm.io.CichorieaeImageImport;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
-import eu.etaxonomy.cdm.io.common.IImportConfigurator;
-import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.EDITOR;
-import eu.etaxonomy.cdm.model.common.ISourceable;
+import eu.etaxonomy.cdm.io.common.Source;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
 import eu.etaxonomy.cdm.model.description.FeatureTree;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.ZoologicalName;
 
 
 /**
  * TODO add the following to a wiki page:
- * HINT: If you are about to import into a mysql data base running under windows and if you wish to dump and restore the resulting data bas under another operation systen 
+ * HINT: If you are about to import into a mysql data base running under windows and if you wish to dump and restore the resulting data base under another operation systen 
  * you must set the mysql system variable lower_case_table_names = 0 in order to create data base with table compatible names.
  * 
  * 
@@ -55,7 +48,7 @@ public class CampanulaceaeActivator {
 	static final ICdmDataSource cdmDestination = CdmDestinations.cdm_campanulaceae_production();
 
 	static final UUID secUuid = UUID.fromString("ed7dd0ea-fcdd-405d-9fe1-52652aa06119");
-	static final UUID taxonomicTreeUuid = UUID.fromString("e305ddac-7200-4293-aa5d-d3426133ed9f");
+	static final UUID classificationUuid = UUID.fromString("e305ddac-7200-4293-aa5d-d3426133ed9f");
 	static final int sourceSecId = 100000;
 	
 	static final UUID featureTreeUuid = UUID.fromString("231809ce-ad9e-4a50-8a48-668bd336cb7e");
@@ -73,12 +66,14 @@ public class CampanulaceaeActivator {
 	static final EDITOR editor = EDITOR.EDITOR_AS_EDITOR;
 	
 	//NomeclaturalCode
-	static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICBN;
+	static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICNAFP;
 
 	//ignore null
 	static final boolean ignoreNull = true;
 	
-	static boolean useTaxonomicTree = true;
+	static boolean useClassification = true;
+	
+	static boolean includesEmCode = false; 
 
 
 // **************** ALL *********************	
@@ -137,7 +132,7 @@ public class CampanulaceaeActivator {
 				
 		BerlinModelImportConfigurator bmImportConfigurator = BerlinModelImportConfigurator.NewInstance(source,  destination);
 		
-		bmImportConfigurator.setTaxonomicTreeUuid(taxonomicTreeUuid);
+		bmImportConfigurator.setClassificationUuid(classificationUuid);
 		bmImportConfigurator.setSourceSecId(sourceSecId);
 		
 		bmImportConfigurator.setNomenclaturalCode(nomenclaturalCode);
@@ -150,7 +145,7 @@ public class CampanulaceaeActivator {
 		bmImportConfigurator.setDoNameStatus(doNameStatus);
 		bmImportConfigurator.setDoTypes(doTypes);
 		bmImportConfigurator.setDoNameFacts(doNameFacts);
-		bmImportConfigurator.setUseTaxonomicTree(useTaxonomicTree);
+		bmImportConfigurator.setUseClassification(useClassification);
 		
 		bmImportConfigurator.setDoTaxa(doTaxa);
 		bmImportConfigurator.setDoRelTaxa(doRelTaxa);
@@ -164,6 +159,7 @@ public class CampanulaceaeActivator {
 		bmImportConfigurator.setDbSchemaValidation(hbm2dll);
 		bmImportConfigurator.setRecordsPerTransaction(recordsPerTransaction);
 		
+		bmImportConfigurator.setIncludesEmCode(includesEmCode);
 
 		// maximum number of name facts to import
 		bmImportConfigurator.setMaximumNumberOfNameFacts(maximumNumberOfNameFacts);
@@ -177,7 +173,7 @@ public class CampanulaceaeActivator {
 		success &= bmImport.invoke(bmImportConfigurator);
 		
 		if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) )   ){
-			CdmApplicationController app = bmImport.getCdmAppController();
+			ICdmApplicationDefaultConfiguration app = bmImport.getCdmAppController();
 			
 			//make feature tree
 			FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);