add Fdg 12-20

diff --git a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/EfloraSources.java b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/EfloraSources.java
index ef200c949616460821feac96e69d6db2318746a0..2a0c4802fd17c183cde040e4c9911e5fcca2151f 100644 (file)
--- a/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/EfloraSources.java
+++ b/cdm-eflora/src/main/java/eu/etaxonomy/cdm/app/eflora/EfloraSources.java
@@ -190,6 +190,52 @@ public class EfloraSources {
                return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol11_final.xml");\r
        }\r
 \r
+       //Flore du Gabon vol 12\r
+       public static URI fdg_12(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol12_final.xml");\r
+       }\r
+\r
+\r
+       //Flore du Gabon vol 13\r
+       public static URI fdg_13(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol13_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 14\r
+       public static URI fdg_14(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol14_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 15\r
+       public static URI fdg_15(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol15_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 16\r
+       public static URI fdg_16(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol16_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 17\r
+       public static URI fdg_17(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol17_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 18\r
+       public static URI fdg_18(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol18_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 19\r
+       public static URI fdg_19(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol19_final.xml");\r
+       }\r
+\r
+       //Flore du Gabon vol 20\r
+       public static URI fdg_20(){\r
+               return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol20_final.xml");\r
+       }\r
+       \r
        //Flore du Gabon vol 21\r
        public static URI fdg_21(){\r
                return URI.create("file://PESIIMPORT3/gabon/markupData/fdgvol21_final.xml");\r

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 3c0d7e8842d763a6910d854e01f45f839b34f0ed..8190844cc1818a1413e6b409a3b84a3b69afab6a 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
@@ -58,6 +58,15 @@ public class FloreGabonActivator extends EfloraActivatorBase {
        static final URI fdg9 = EfloraSources.fdg_9();\r
        static final URI fdg10 = EfloraSources.fdg_10();\r
        static final URI fdg11 = EfloraSources.fdg_11();\r
+       static final URI fdg12 = EfloraSources.fdg_12();\r
+       static final URI fdg13 = EfloraSources.fdg_13();\r
+       static final URI fdg14 = EfloraSources.fdg_14();\r
+       static final URI fdg15 = EfloraSources.fdg_15();\r
+       static final URI fdg16 = EfloraSources.fdg_16();\r
+       static final URI fdg17 = EfloraSources.fdg_17();\r
+       static final URI fdg18 = EfloraSources.fdg_18();\r
+       static final URI fdg19 = EfloraSources.fdg_19();\r
+       static final URI fdg20 = EfloraSources.fdg_20();\r
        static final URI fdg21 = EfloraSources.fdg_21();\r
        static final URI fdg22 = EfloraSources.fdg_22();\r
        static final URI fdg27 = EfloraSources.fdg_27();\r
@@ -99,7 +108,7 @@ public class FloreGabonActivator extends EfloraActivatorBase {
        \r
        \r
        //if true, use inverse include information\r
-       private boolean inverseInclude = false;\r
+       private boolean inverseInclude = true;\r
        \r
        private boolean includeFdg1 = true;\r
        private boolean includeFdg2 = true;\r
@@ -113,13 +122,22 @@ public class FloreGabonActivator extends EfloraActivatorBase {
        private boolean includeFdg9 = true;\r
        private boolean includeFdg10 = true;\r
        private boolean includeFdg11 = true;\r
+       private boolean includeFdg12 = true;\r
+       private boolean includeFdg13 = true;\r
+       private boolean includeFdg14 = true;\r
+       private boolean includeFdg15 = true;\r
+       private boolean includeFdg16 = true;\r
+       private boolean includeFdg17 = true;\r
+       private boolean includeFdg18 = true;\r
+       private boolean includeFdg19 = true;\r
+       private boolean includeFdg20 = true;\r
        private boolean includeFdg21 = true;\r
        private boolean includeFdg22 = true;\r
        private boolean includeFdg27 = true;\r
        private boolean includeFdg28 = true;\r
        private boolean includeFdg30 = true;\r
-       private boolean includeFdg34 = true;\r
-       private boolean includeFdg35 = true;\r
+       private boolean includeFdg34 = false;\r
+       private boolean includeFdg35 = false;\r
        \r
 // **************** NO CHANGE **********************************************/\r
        \r
@@ -186,6 +204,33 @@ public class FloreGabonActivator extends EfloraActivatorBase {
 \r
                //Vol11\r
                executeVolume(fdg11, includeFdg11 ^ inverseInclude);\r
+               \r
+               //Vol12\r
+               executeVolume(fdg12, includeFdg12 ^ inverseInclude);\r
+               \r
+               //Vol13\r
+               executeVolume(fdg13, includeFdg13 ^ inverseInclude);\r
+               \r
+               //Vol14\r
+               executeVolume(fdg14, includeFdg14 ^ inverseInclude);\r
+               \r
+               //Vol15\r
+               executeVolume(fdg15, includeFdg15 ^ inverseInclude);\r
+               \r
+               //Vol16\r
+               executeVolume(fdg16, includeFdg16 ^ inverseInclude);\r
+               \r
+               //Vol17\r
+               executeVolume(fdg17, includeFdg17 ^ inverseInclude);\r
+               \r
+               //Vol18\r
+               executeVolume(fdg18, includeFdg18 ^ inverseInclude);\r
+               \r
+               //Vol19\r
+               executeVolume(fdg19, includeFdg19 ^ inverseInclude);\r
+               \r
+               //Vol20\r
+               executeVolume(fdg20, includeFdg20 ^ inverseInclude);\r
 \r
                //Vol21\r
                executeVolume(fdg21, includeFdg21 ^ inverseInclude);\r