Fauna Europaea Import

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportConfigurator.java
index d54f4c68b0c417dbfd490c29d5ff1f1c020cd1dd..dd49b9907d869287bf9f23843405cf8743f1a409 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportConfigurator.java
@@ -56,7 +56,7 @@ public class FaunaEuropaeaImportConfigurator extends ImportConfiguratorBase<Faun
 //                             FaunaEuropaeaAuthorImport.class,\r
 //                             FaunaEuropaeaNameImport.class,\r
 //                             FaunaEuropaeaRelShipImport.class,\r
-                               FaunaEuropaeaRelTaxonIncludeImport.class,\r
+                               FaunaEuropaeaRelTaxonIncludeImport.class\r
 //                             FaunaEuropaeaRefImport.class,\r
 //                             FaunaEuropaeaDistributionImport.class\r
                };\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaNameImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaNameImport.java
index 7045601a4818f09a1bddef16c8257f23a4e3aaf3..e21cc3343f5f08c47b07b3357662adc5397f3cdd 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaNameImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaNameImport.java
@@ -432,36 +432,6 @@ public class FaunaEuropaeaNameImport extends FaunaEuropaeaImportBase  {
                                                        if (logger.isDebugEnabled()) {\r
                                                                logger.debug("Taxon created (" + taxonId + ")");\r
                                                        }\r
-\r
-//                                                     if (fauEuConfig.isDoBasionyms()) {\r
-//                                                             if (fauEuTaxon.isParenthesis() && (fauEuTaxon.getOriginalGenusId() != 0)\r
-//                                                                             && (fauEuTaxon.getParentId() != fauEuTaxon.getOriginalGenusId())) {\r
-//\r
-//                                                                     // create basionym\r
-//                                                                     ZoologicalName basionym = ZoologicalName.NewInstance(rank);\r
-//                                                                     basionym.setNameCache(localName);\r
-//                                                                     basionym.setCombinationAuthorTeam(author);\r
-//                                                                     basionym.setPublicationYear(year);\r
-//                                                                     zooName.addBasionym(basionym, sourceReference, null, null);\r
-//                                                                     zooName.setBasionymAuthorTeam(author);\r
-//                                                                     if (logger.isDebugEnabled()) {\r
-//                                                                             logger.debug("Basionym created (" + taxonId + ")");\r
-//                                                                     }\r
-//\r
-//                                                                     // create homotypic synonym\r
-//                                                                     Synonym homotypicSynonym = Synonym.NewInstance(basionym, sourceReference);\r
-////                                                                   SynonymRelationship synRel = \r
-////                                                                           taxon.addSynonym(homotypicSynonym, SynonymRelationshipType.HOMOTYPIC_SYNONYM_OF(), \r
-////                                                                                           sourceReference, null);\r
-////                                                                   homotypicSynonym.addRelationship(synRel);\r
-//                                                                     taxon.addHomotypicSynonym(homotypicSynonym, sourceReference, null);\r
-//                                                                     if (logger.isDebugEnabled()) {\r
-//                                                                             logger.debug("Homotypic synonym created (" + taxonId + ")");\r
-//                                                                     }\r
-//\r
-//                                                             }\r
-//                                                     }\r
-                                                       \r
                                                }\r
                                                taxonBase = taxon;\r
                                        } else if ((status == T_STATUS_NOT_ACCEPTED) && (autId != A_AUCT)) { // synonym\r
@@ -704,7 +674,7 @@ public class FaunaEuropaeaNameImport extends FaunaEuropaeaImportBase  {
                if (parent == null) {\r
                        nameCacheStringBuilder.append(fauEuTaxon.getLocalName());\r
                        if (logger.isInfoEnabled()) {\r
-                               logger.info("Parent of (" + fauEuTaxon.getId() + " is null");\r
+                               logger.info("Parent of (" + fauEuTaxon.getId() + ") is null");\r
                        }\r
                        return nameCacheStringBuilder.toString();\r
                }\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelTaxonIncludeImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelTaxonIncludeImport.java
index 12ed638eef2bc850893a212dcb2b0fa2ad50920f..f2ba5cb8c6a175a298e7203f89c9d8d383ad9168 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelTaxonIncludeImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelTaxonIncludeImport.java
@@ -149,6 +149,12 @@ public class FaunaEuropaeaRelTaxonIncludeImport extends FaunaEuropaeaImportBase
        \r
        protected boolean doInvoke(FaunaEuropaeaImportState state) {                            \r
                \r
+               Map<String, MapWrapper<? extends CdmBase>> stores = state.getStores();\r
+               MapWrapper<TaxonBase> taxonStore = (MapWrapper<TaxonBase>)stores.get(ICdmIO.TAXON_STORE);\r
+               taxonStore.makeEmpty();\r
+               MapWrapper<TeamOrPersonBase> authorStore = (MapWrapper<TeamOrPersonBase>)stores.get(ICdmIO.TEAM_STORE);\r
+               authorStore.makeEmpty();\r
+               \r
                boolean success = true;\r
                \r
                if(logger.isInfoEnabled()) { logger.info("Start making taxa..."); }\r
@@ -608,9 +614,6 @@ public class FaunaEuropaeaRelTaxonIncludeImport extends FaunaEuropaeaImportBase
         * This takes about 2min for a block of 5000.*/\r
        private boolean createRelationships(FaunaEuropaeaImportState state) {\r
 \r
-               Map<String, MapWrapper<? extends CdmBase>> stores = state.getStores();\r
-               MapWrapper<TaxonBase> taxonStore = (MapWrapper<TaxonBase>)stores.get(ICdmIO.TAXON_STORE);\r
-               taxonStore.makeEmpty();\r
                Map<UUID, UUID> childParentUuidMap = state.getChildParentMap();\r
                ReferenceBase<?> sourceRef = state.getConfig().getSourceReference();\r
 \r