Latest changes to cuba import

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / app / cuba / CubaActivator.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cuba/CubaActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cuba/CubaActivator.java
index 4ed4820236e596555bf238f454e47f76c522234b..55ff0da2d3a4eaf9ec75a166465b41e7c64bd46e 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cuba/CubaActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cuba/CubaActivator.java
@@ -22,6 +22,7 @@ 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.cuba.CubaImportConfigurator;
+import eu.etaxonomy.cdm.io.cuba.CubaTransformer;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.FeatureNode;
@@ -39,33 +40,33 @@ public class CubaActivator {
        //database validation status (create, update, validate ...)
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;
 
-       boolean invers = true;
-       boolean include = !invers;
-       boolean exists = true;
+//    static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
+//  static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_test();
+    static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cuba_production();
+
+       static boolean invers = false;
 
     boolean doAsteraceae = include;
-    boolean doConvolvulaceae = include && exists;   //x
-    boolean doCyperaceae = include && exists;   //x
+    boolean doConvolvulaceae = include;
+    boolean doCyperaceae = include;
     boolean doDicotA_C = include;
     boolean doDicotD_M = include;
     boolean doDicotN_Z = include;
     boolean doEuphorbiaceae = include;
-    boolean doFabaceae = include && exists;
+    boolean doFabaceae = include;
     boolean doGymnospermae = include;
     boolean doLamVerbenaceae = include;
-    boolean doMalpighiaceae = include && exists;
-    boolean doMelastomataceae = include && exists;
-    boolean doMonocots = include && exists;
-    boolean doMyrtaceae = ! include && exists;
+    boolean doMalpighiaceae = include;
+    boolean doMelastomataceae = include;
+    boolean doMonocots = include;
+    boolean doMyrtaceae = include;
     boolean doOrchidaceae = include;
     boolean doRubiaceae = include;
-    boolean doUrticaceae = include && exists;
+    boolean doUrticaceae = include;
+
+    static boolean include = !invers;
 
 
-    static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_test();
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev();
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cuba_production();
 
 
        //feature tree uuid
@@ -182,9 +183,11 @@ public class CubaActivator {
     private void doSource(URI source, CubaImportConfigurator config,
             CdmDefaultImport<CubaImportConfigurator> myImport, boolean doVocabularies) {
         config.setSource(source);
-        System.out.println("Start import from ("+ source.toString() + ") ...");
+        String message = "Start import from ("+ source.toString() + ") ...";
+        System.out.println(message);
+        logger.warn(message);
         config.setSourceReference(getSourceReference(sourceReferenceTitle));
-        config.setDoVocabularies(false);
+        config.setDoVocabularies(doVocabularies);
         myImport.invoke(config);
 
         if (doVocabularies){
@@ -215,6 +218,14 @@ public class CubaActivator {
                newNode = FeatureNode.NewInstance(Feature.DISTRIBUTION());
                root.addChild(newNode);
 
+               Feature featurAltFam = (Feature)service.find(CubaTransformer.uuidAlternativeFamily);
+               newNode = FeatureNode.NewInstance(featurAltFam);
+               root.addChild(newNode);
+
+           Feature featurAltFam2 = (Feature)service.find(CubaTransformer.uuidAlternativeFamily2);
+           newNode = FeatureNode.NewInstance(featurAltFam2);
+           root.addChild(newNode);
+
 //             newNode = FeatureNode.NewInstance(Feature.SYSTEMATICS());
 //             root.addChild(newNode);