(no commit message)

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java
index f7465569bb6a5df381e5a31a51375943c6099166..e53ae624d9a4df82f3293043e46150f93a4e809a 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java
@@ -25,6 +25,7 @@ import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 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.IImportConfigurator.EDITOR;\r
 import eu.etaxonomy.cdm.model.common.ISourceable;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -68,6 +69,9 @@ public class CichorieaeActivator {
        //check - import\r
        static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
 \r
+       //editor - import\r
+       static final EDITOR editor = EDITOR.EDITOR_AS_EDITOR;\r
+       \r
        //NomeclaturalCode\r
        static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICBN;\r
 \r
@@ -93,13 +97,17 @@ public class CichorieaeActivator {
        static final boolean doFacts = true;\r
        static final boolean doOccurences = true;\r
 \r
+       //etc.\r
+       static final boolean doMarker = true;\r
+       static final boolean doUser = true;\r
+\r
        \r
 // **************** SELECTED *********************\r
 \r
 //     //authors\r
 //     static final boolean doAuthors = false;\r
 //     //references\r
-//     static final DO_REFERENCES doReferences =  DO_REFERENCES.ALL;\r
+//     static final DO_REFERENCES doReferences =  DO_REFERENCES.NONE;\r
 //     //names\r
 //     static final boolean doTaxonNames = false;\r
 //     static final boolean doRelNames = false;\r
@@ -110,8 +118,13 @@ public class CichorieaeActivator {
 //     //taxa \r
 //     static final boolean doTaxa = true;\r
 //     static final boolean doRelTaxa = false;\r
-//     static final boolean doFacts = true;\r
+//     static final boolean doFacts = false;\r
 //     static final boolean doOccurences = false;\r
+//     \r
+//     //etc.\r
+//     static final boolean doMarker = true;\r
+//     static final boolean doUser = true;\r
+       \r
        \r
        /**\r
         * @param args\r
@@ -143,6 +156,9 @@ public class CichorieaeActivator {
                bmImportConfigurator.setDoRelTaxa(doRelTaxa);\r
                bmImportConfigurator.setDoFacts(doFacts);\r
                bmImportConfigurator.setDoOccurrence(doOccurences);\r
+               \r
+               bmImportConfigurator.setDoMarker(doMarker);\r
+               bmImportConfigurator.setDoUser(doUser);\r
                bmImportConfigurator.setDbSchemaValidation(hbm2dll);\r
 \r
                // mediaResourceLocations\r
@@ -158,6 +174,7 @@ public class CichorieaeActivator {
                \r
                \r
                bmImportConfigurator.setCheck(check);\r
+               bmImportConfigurator.setEditor(editor);\r
                \r
                // invoke import\r
                CdmDefaultImport<BerlinModelImportConfigurator> bmImport = new CdmDefaultImport<BerlinModelImportConfigurator>();\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java
index fcc4406af059ff044c3cc1ae02517c1f0c741dee..e370170673a23d996685712812ac92fbaf2feffc 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java
@@ -46,14 +46,14 @@ public class DipteraActivator {
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
        static final Source berlinModelSource = BerlinModelSources.EDIT_Diptera();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.localH2Diptera();\r
        static final UUID secUuid = UUID.fromString("06fd671f-1226-4e3b-beca-1959b3b32e20");\r
        static final int sourceSecId = 1000000;\r
        static final UUID featureTreeUuid = UUID.fromString("ae9615b8-bc60-4ed0-ad96-897f9226d568");\r
        static final Object[] featureKeyList = new Integer[]{1,4,5,10,11,12,13,99}; \r
        \r
        //check - import\r
-       static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;\r
+       static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
 \r
        static final boolean doDistributionParser = true;  //also run DipteraDistributionParser\r
 \r
@@ -80,6 +80,12 @@ public class DipteraActivator {
        static final boolean doFacts = true;\r
        static final boolean doOccurences = false;\r
        \r
+       //etc.\r
+       static final boolean doMarker = true;\r
+       static final boolean doUser = true;\r
+\r
+// **************** SELECTED *********************\r
+       \r
 //     //authors\r
 //     static final boolean doAuthors = true;\r
 //     //references\r
@@ -96,7 +102,10 @@ public class DipteraActivator {
 //     static final boolean doRelTaxa = false;\r
 //     static final boolean doFacts = true;\r
 //     static final boolean doOccurences = false;\r
-       \r
+//     \r
+//     //etc.\r
+//     static final boolean doMarker = false;\r
+//     static final boolean doUser = false;    \r
 \r
        \r
        /**\r
@@ -128,6 +137,10 @@ public class DipteraActivator {
                bmImportConfigurator.setDoRelTaxa(doRelTaxa);\r
                bmImportConfigurator.setDoFacts(doFacts);\r
                bmImportConfigurator.setDoOccurrence(doOccurences);\r
+               \r
+               bmImportConfigurator.setDoMarker(doMarker);\r
+               bmImportConfigurator.setDoUser(doUser);\r
+               \r
                bmImportConfigurator.setDbSchemaValidation(hbm2dll);\r
 \r
                bmImportConfigurator.setCheck(check);\r