latest changes to Gabon and Guiana activators

[cdmlib-apps.git] / cdm-eflora / src / main / java / eu / etaxonomy / cdm / app / eflora / FloreGabonActivator.java

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloreGabonActivator.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloreGabonActivator.java
index 579a37906448c3d59a22d265f475abcf3e87bbd1..d61493289237281bdfe289df969f1194a788fced 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloreGabonActivator.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/FloreGabonActivator.java
@@ -27,7 +27,6 @@ import eu.etaxonomy.cdm.io.common.events.IIoObserver;
 import eu.etaxonomy.cdm.io.common.events.LoggingIoObserver;\r
 import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;\r
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
-import eu.etaxonomy.cdm.io.eflora.floraMalesiana.FloraMalesianaTransformer;\r
 import eu.etaxonomy.cdm.io.markup.MarkupImportConfigurator;\r
 import eu.etaxonomy.cdm.io.markup.MarkupTransformer;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
@@ -55,8 +54,8 @@ public class FloreGabonActivator {
        \r
        \r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_flore_gabon_preview();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_flore_gabon_production();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_flore_gabon_production();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
        \r
 \r
@@ -189,6 +188,8 @@ public class FloreGabonActivator {
 \r
                newNode = addFeataureNodesByStringList(generellDescriptionsFromPhytoChemoList, root, transformer, service);\r
                \r
+               newNode = FeatureNode.NewInstance(Feature.COMMON_NAME());\r
+               root.addChild(newNode);\r
                \r
                newNode = FeatureNode.NewInstance(Feature.DISTRIBUTION());\r
                root.addChild(newNode);\r
@@ -268,11 +269,13 @@ public class FloreGabonActivator {
        \r
        private static String [] descriptionFeatureList = new String[]{\r
                "lifeform", \r
+               "Juvenile parts",\r
                "Bark",\r
                //new\r
                "wood",\r
                "Indumentum",  \r
                "endophytic body",  \r
+               "apical buds",\r
                "flowering buds",  \r
                "Branchlets",  \r
                "Branches",  \r
@@ -284,10 +287,17 @@ public class FloreGabonActivator {
                "Stems",  \r
                "stem leaves", \r
                "Leaves",\r
+               "extraxylary sclerenchyma",\r
                "flower-bearing stems",  \r
                "Petiole",  \r
                "Petiolules",  \r
                "Leaflets", \r
+               "Lamina",\r
+               "Veins",\r
+               "Lateral veins",\r
+               "secondary veins",\r
+               "Intersecondary veins",\r
+               "veinlets",\r
                "Thyrsus",  \r
                "Thyrses",  \r
                "Inflorescences",  \r
@@ -295,6 +305,7 @@ public class FloreGabonActivator {
                "Young inflorescences", \r
                "Male inflorescences", \r
                "Female inflorescences", \r
+               "rachises",\r
                "Bracts",  \r
                "Pedicels",  \r
                "flowering buds",  \r
@@ -311,6 +322,7 @@ public class FloreGabonActivator {
                "Axillary",  \r
                "cymes",  \r
                "Calyx",  \r
+               "Androgynophore",\r
                "Petal",  \r
                "Petals",\r
                "perigone",\r
@@ -332,7 +344,8 @@ public class FloreGabonActivator {
                "Style",  \r
                "annulus",  \r
                "female flowers",  \r
-               "Male flowers",  \r
+               "Male flowers", \r
+               "Androphore",\r
                "Female",  \r
                "Infructescences",    //order not consistent (sometimes before "Flowers")  \r
                "Fruit",  \r
@@ -351,7 +364,7 @@ public class FloreGabonActivator {
        \r
                "figure",  \r
                "fig",  \r
-               "figs",  \r
+               "figs",   \r
 \r
 \r
                \r