Fauna Europaea Import - relationships

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxonImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxonImport.java
index d719ac7b1b35a64bd4596e411375d695d9958719..4718fba0d040bfcdf0cc5436065ad825dfe1d878 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxonImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxonImport.java
@@ -49,6 +49,7 @@ import eu.etaxonomy.cdm.model.reference.PublicationBase;
 import eu.etaxonomy.cdm.model.reference.Publisher;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
 import eu.etaxonomy.cdm.model.taxon.Synonym;\r
+import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
@@ -64,7 +65,7 @@ public class FaunaEuropaeaTaxonImport extends FaunaEuropaeaImportBase  {
        private static final Logger logger = Logger.getLogger(FaunaEuropaeaTaxonImport.class);\r
 \r
        /* Max number of taxa to retrieve (for test purposes) */\r
-       private int maxTaxa = 0;\r
+       private int maxTaxa = 5000;\r
        /* Max number of taxa to be saved with one service call */\r
        private int limit = 10000; // TODO: Make configurable\r
        /* Interval for progress info message when retrieving taxa */\r
@@ -296,13 +297,13 @@ public class FaunaEuropaeaTaxonImport extends FaunaEuropaeaImportBase  {
                for (int id : taxonStore.keySet())\r
                {\r
                        TaxonBase<?> taxonBase = taxonStore.get(id);\r
+                       TaxonNameBase<?,?> taxonName = taxonBase.getName();\r
                        FaunaEuropaeaTaxon fauEuTaxon = fauEuTaxonMap.get(id);\r
                        \r
                        if (logger.isDebugEnabled()) { logger.debug("Taxon # " + id); }\r
-                       String nameString = calculateTaxonName(fauEuTaxon, taxonBase, taxonStore, fauEuTaxonMap);\r
-//                     String nameString = calculateTaxonName(fauEuTaxon, taxonBase, taxonStore);\r
+                       String nameString = calculateTaxonName(fauEuTaxon, taxonBase, taxonName, taxonStore, fauEuTaxonMap);\r
+                       createRelationships(fauEuTaxon, taxonBase, taxonName, fauEuTaxonMap);\r
                        setTaxonName(nameString, fauEuTaxon, taxonBase, fauEuConfig);\r
-                       \r
                }\r
                return success; \r
        }\r
@@ -363,7 +364,29 @@ public class FaunaEuropaeaTaxonImport extends FaunaEuropaeaImportBase  {
                }\r
                return result;\r
        }\r
-                       \r
+\r
+       private boolean createRelationships(FaunaEuropaeaTaxon fauEuTaxon,\r
+                       TaxonBase<?> taxonBase, TaxonNameBase<?,?> taxonName,\r
+                       Map<Integer, FaunaEuropaeaTaxon> fauEuTaxonMap) {\r
+               \r
+               boolean success = true;\r
+               \r
+               if (!fauEuTaxon.isValid()) {\r
+\r
+                       try {\r
+\r
+                               Taxon taxon = taxonBase.deproxy(taxonBase, Taxon.class);\r
+                               Synonym synonym = Synonym.NewInstance(taxonName, null); // TODO: sec\r
+                               taxon.addSynonym(synonym, SynonymRelationshipType.HETEROTYPIC_SYNONYM_OF());\r
+\r
+                       } catch (Exception e) {\r
+\r
+                       }\r
+               }\r
+               \r
+               return success;\r
+               \r
+       }\r
                        \r
        /* Build parent's taxon name */\r
        private String buildParentName(int originalTaxonRank, String concatString, FaunaEuropaeaTaxon fauEuTaxon,\r
@@ -402,9 +425,9 @@ public class FaunaEuropaeaTaxonImport extends FaunaEuropaeaImportBase  {
 //                             if(parentName != null) {\r
 //                             parentString = ((ZoologicalName)parentName).getNameCache();\r
 \r
-\r
                                parentString = parent.getLocalName();\r
-\r
+                               \r
+                               \r
 //                             if (fauEuTaxon.isValid()) {\r
 //                             parentString = parent.getLocalName();\r
 //                             } else {\r
@@ -478,7 +501,7 @@ public class FaunaEuropaeaTaxonImport extends FaunaEuropaeaImportBase  {
        \r
        /* Build taxon's concatenated name string */\r
        private String calculateTaxonName(FaunaEuropaeaTaxon fauEuTaxon,\r
-                       TaxonBase<?> taxonBase, MapWrapper<TaxonBase> taxonStore,\r
+                       TaxonBase<?> taxonBase, TaxonNameBase<?,?>taxonName, MapWrapper<TaxonBase> taxonStore,\r
                        Map<Integer, FaunaEuropaeaTaxon> fauEuTaxonMap) {\r
 \r
                /* Local name string */\r
@@ -486,7 +509,7 @@ public class FaunaEuropaeaTaxonImport extends FaunaEuropaeaImportBase  {
                /* Concatenated parent's name string */\r
                String parentString = "";\r
                \r
-               TaxonNameBase<?,?> taxonName = taxonBase.getName();\r
+//             TaxonNameBase<?,?> taxonName = taxonBase.getName();\r
                ZoologicalName zooName = (ZoologicalName)taxonName;\r
 \r
                if (zooName != null) {\r