Fauna Europaea Import

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java
index 4722e9c63c58d63e08bce9bdf694cc0217dd54cc..ca3de36a107a28b49a099289d70c9ad9388c8553 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaActivator.java
@@ -14,10 +14,10 @@ import org.apache.log4j.Logger;
 import eu.etaxonomy.cdm.app.common.CdmDestinations;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
-import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
-import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.DO_REFERENCES;\r
+import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\r
+import eu.etaxonomy.cdm.io.common.Source;\r
 import eu.etaxonomy.cdm.io.faunaEuropaea.FaunaEuropaeaImportConfigurator;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 \r
@@ -33,17 +33,24 @@ public class FaunaEuropaeaActivator {
        \r
        static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;\r
        static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
+//     static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
+//     static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.UPDATE;\r
        static final NomenclaturalCode nomenclaturalCode  = NomenclaturalCode.ICZN;\r
 \r
 // ****************** ALL *****************************************\r
        \r
        static final boolean doAuthors = true;\r
-       static final DO_REFERENCES doReferences =  DO_REFERENCES.ALL;\r
        static final boolean doTaxa = true;\r
-       static final boolean doSynonyms = true;\r
-       static final boolean doRelTaxa = true;\r
+       static final DO_REFERENCES doReferences =  DO_REFERENCES.ALL;\r
        static final boolean doDistributions = true;\r
+       \r
+       static final boolean doBasionyms = true;\r
+       static final boolean doTaxonomicallyIncluded = true;\r
+       static final boolean doMisappliedNames = true;\r
+       static final boolean doHeterotypicSynonyms = true;\r
 \r
+       static final boolean useTransactions = true;\r
+       \r
 // ************************ NONE **************************************** //\r
                \r
 //     static final boolean doAuthors = false;\r
@@ -65,17 +72,20 @@ public class FaunaEuropaeaActivator {
                FaunaEuropaeaImportConfigurator fauEuImportConfigurator = \r
                        FaunaEuropaeaImportConfigurator.NewInstance(faunaEuropaeaSource,  destination);\r
                \r
+               fauEuImportConfigurator.setDbSchemaValidation(dbSchemaValidation);\r
                fauEuImportConfigurator.setNomenclaturalCode(nomenclaturalCode);\r
+               fauEuImportConfigurator.setCheck(check);\r
 \r
                fauEuImportConfigurator.setDoAuthors(doAuthors);\r
-               fauEuImportConfigurator.setDoReferences(doReferences);\r
                fauEuImportConfigurator.setDoTaxa(doTaxa);\r
-               fauEuImportConfigurator.setDoRelTaxa(doRelTaxa);\r
+               fauEuImportConfigurator.setDoReferences(doReferences);\r
                fauEuImportConfigurator.setDoOccurrence(doDistributions);\r
-               fauEuImportConfigurator.setDbSchemaValidation(dbSchemaValidation);\r
+               fauEuImportConfigurator.setDoTaxonomicallyIncluded(doTaxonomicallyIncluded);\r
+               fauEuImportConfigurator.setDoBasionyms(doBasionyms);\r
+               fauEuImportConfigurator.setDoMisappliedNames(doMisappliedNames);\r
+               fauEuImportConfigurator.setDoHeterotypicSynonyms(doHeterotypicSynonyms);\r
+               fauEuImportConfigurator.setUseTransactions(useTransactions);\r
 \r
-               fauEuImportConfigurator.setCheck(check);\r
-               \r
                // invoke import\r
                CdmDefaultImport<FaunaEuropaeaImportConfigurator> fauEuImport = \r
                        new CdmDefaultImport<FaunaEuropaeaImportConfigurator>();\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaSources.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaSources.java
index 8a432c80e2c43cc9b75fdce85801a2dcb4a45729..4f90d482f0cb46e1ddbac9d84d6b4d9c10568e7b 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaSources.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaSources.java
@@ -26,6 +26,7 @@ public class FaunaEuropaeaSources {
                //      Fauna Europaea\r
                //String dbms = Source.SQL_SERVER_2000;\r
                String dbms = Source.SQL_SERVER_2005;\r
+//             String strServer = "160.45.63.37";\r
                String strServer = "BGBM14";               // "192.168.1.36";\r
                String strDB = "FaunEu";\r
                int port = 1433;\r