latest updates to MTMooseActivator

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/MTMooseActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/MTMooseActivator.java
index 2706630fed8418c41d7d4b0d9ca1e426e5699488..cff9316e9610d3e330408c93663548c7311ec395 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/MTMooseActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/MTMooseActivator.java
@@ -21,6 +21,7 @@ import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;\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.io.common.Source;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
 import eu.etaxonomy.cdm.model.description.FeatureNode;\r
@@ -43,23 +44,29 @@ public class MTMooseActivator {
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
        static final Source berlinModelSource = BerlinModelSources.MT_MOOSE();\r
+       \r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_mt_moose();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_moose();\r
-       \r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_moose();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_test();\r
        \r
        static final UUID classificationUuid = UUID.fromString("601d8a00-cffe-4509-af93-b15b543ccf8d");\r
        static final UUID sourceRefUuid = UUID.fromString("601d8a00-cffe-4509-af93-b15b543ccf8d");\r
        \r
-       static final UUID featureTreeUuid = UUID.fromString("4c5b5bbe-6fef-4607-96b2-1b0104eac19e");\r
-       static final Object[] featureKeyList = new Integer[]{7,201,202,203,204,205,206,207}; \r
+//     static final UUID featureTreeUuid = UUID.fromString("4c5b5bbe-6fef-4607-96b2-1b0104eac19e");\r
+//     static final Object[] featureKeyList = new Integer[]{7,201,202,203,204,205,206,207}; \r
+       \r
+       static final boolean includeFlatClassifications = true; \r
+\r
        \r
        //check - import\r
-       static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
+       static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;\r
 \r
 \r
        //NomenclaturalCode\r
        static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICNAFP;\r
+       \r
+       static final EDITOR editor = EDITOR.EDITOR_AS_EDITOR;\r
 \r
 // ****************** ALL *****************************************\r
        \r
@@ -72,14 +79,14 @@ public class MTMooseActivator {
        static final boolean doRelNames = true;\r
        static final boolean doNameStatus = true;\r
        static final boolean doTypes = true;  \r
-       static final boolean doNameFacts = false;   //no name facts exist  \r
+       static final boolean doNameFacts = false;   //no name facts exist\r
        \r
        //taxa\r
        static final boolean doTaxa = true;\r
        static final boolean doRelTaxa = true;\r
        static final boolean doFacts = false;    //no facts exist\r
        static final boolean doOccurences = false;   //no occurrences exist\r
-       static final boolean doCommonNames = false;  //nocommon names exist\r
+       static final boolean doCommonNames = false;  //no common names exist\r
 \r
 // ************************ NONE **************************************** //\r
        \r
@@ -109,44 +116,46 @@ public class MTMooseActivator {
                Source source = berlinModelSource;\r
                ICdmDataSource destination = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmDestination;\r
                \r
-               BerlinModelImportConfigurator bmImportConfigurator = BerlinModelImportConfigurator.NewInstance(source,  destination);\r
+               BerlinModelImportConfigurator config = BerlinModelImportConfigurator.NewInstance(source,  destination);\r
                \r
-               bmImportConfigurator.setClassificationUuid(classificationUuid);\r
+               config.setClassificationUuid(classificationUuid);\r
 //             bmImportConfigurator.setSourceSecId(sourceSecId);\r
-               bmImportConfigurator.setNomenclaturalCode(nomenclaturalCode);\r
-\r
-               bmImportConfigurator.setDoAuthors(doAuthors);\r
-               bmImportConfigurator.setDoReferences(doReferences);\r
-               bmImportConfigurator.setDoTaxonNames(doTaxonNames);\r
-               bmImportConfigurator.setDoRelNames(doRelNames);\r
-               bmImportConfigurator.setDoNameStatus(doNameStatus);\r
-               bmImportConfigurator.setDoTypes(doTypes);\r
-               bmImportConfigurator.setDoNameFacts(doNameFacts);\r
+               config.setNomenclaturalCode(nomenclaturalCode);\r
+               config.setEditor(editor);\r
+               config.setIncludeFlatClassifications(includeFlatClassifications);\r
+\r
+               config.setDoAuthors(doAuthors);\r
+               config.setDoReferences(doReferences);\r
+               config.setDoTaxonNames(doTaxonNames);\r
+               config.setDoRelNames(doRelNames);\r
+               config.setDoNameStatus(doNameStatus);\r
+               config.setDoTypes(doTypes);\r
+               config.setDoNameFacts(doNameFacts);\r
                \r
-               bmImportConfigurator.setDoTaxa(doTaxa);\r
-               bmImportConfigurator.setDoRelTaxa(doRelTaxa);\r
-               bmImportConfigurator.setDoFacts(doFacts);\r
-               bmImportConfigurator.setDoOccurrence(doOccurences);\r
-               bmImportConfigurator.setDoCommonNames(doCommonNames);\r
-               bmImportConfigurator.setSourceRefUuid(sourceRefUuid);\r
+               config.setDoTaxa(doTaxa);\r
+               config.setDoRelTaxa(doRelTaxa);\r
+               config.setDoFacts(doFacts);\r
+               config.setDoOccurrence(doOccurences);\r
+               config.setDoCommonNames(doCommonNames);\r
+               config.setSourceRefUuid(sourceRefUuid);\r
                \r
-               bmImportConfigurator.setDbSchemaValidation(hbm2dll);\r
+               config.setDbSchemaValidation(hbm2dll);\r
 \r
-               bmImportConfigurator.setCheck(check);\r
+               config.setCheck(check);\r
                \r
                // invoke import\r
                CdmDefaultImport<BerlinModelImportConfigurator> bmImport = new CdmDefaultImport<BerlinModelImportConfigurator>();\r
-               bmImport.invoke(bmImportConfigurator);\r
-\r
-               if (doFacts && (bmImportConfigurator.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || bmImportConfigurator.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) )   ){\r
-                       ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
-                       \r
-                       //make feature tree\r
-                       FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, bmImportConfigurator.getFeatureMap(), featureKeyList);\r
-                       FeatureNode distributionNode = FeatureNode.NewInstance(Feature.DISTRIBUTION());\r
-                       tree.getRoot().addChild(distributionNode, 0); \r
-                       app.getFeatureTreeService().saveOrUpdate(tree);\r
-               }\r
+               bmImport.invoke(config);\r
+\r
+//             if (doFacts && (config.getCheck().equals(CHECK.CHECK_AND_IMPORT)  || config.getCheck().equals(CHECK.IMPORT_WITHOUT_CHECK) )   ){\r
+//                     ICdmApplicationConfiguration app = bmImport.getCdmAppController();\r
+//                     \r
+//                     //make feature tree\r
+//                     FeatureTree tree = TreeCreator.flatTree(featureTreeUuid, config.getFeatureMap(), featureKeyList);\r
+//                     FeatureNode distributionNode = FeatureNode.NewInstance(Feature.DISTRIBUTION());\r
+//                     tree.getRoot().addChild(distributionNode, 0); \r
+//                     app.getFeatureTreeService().saveOrUpdate(tree);\r
+//             }\r
                \r
                \r
                System.out.println("End import from BerlinModel ("+ source.getDatabase() + ")...");\r