(no commit message)

[cdmlib.git] / cdmlib-io / src / main / java / eu / etaxonomy / cdm / io / berlinModel / BerlinModelTaxonIO.java

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java
index 322ed9b34244d1591f1cc6efe4eb93026dee1507..d668c000f88bbed489e5914cfcf5f8d64bd46d55 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonIO.java
@@ -37,16 +37,16 @@ public class BerlinModelTaxonIO {
 \r
        private static int modCount = 30000;\r
 \r
-       public static boolean invoke(Source source, CdmApplicationController cdmApp, boolean deleteAll, \r
+       public static boolean invoke(BerlinModelImportConfigurator bmiConfig, CdmApplicationController cdmApp, \r
                        MapWrapper<TaxonBase> taxonMap, MapWrapper<TaxonNameBase> taxonNameMap, MapWrapper<ReferenceBase> referenceMap){\r
-               \r
+               Source source = bmiConfig.getSource();\r
                String dbAttrName;\r
                String cdmAttrName;\r
                \r
                logger.info("start makeTaxa ...");\r
                \r
                ITaxonService taxonService = cdmApp.getTaxonService();\r
-               boolean delete = deleteAll;\r
+               boolean delete = bmiConfig.isDeleteAll();\r
 \r
                try {\r
                        //get data from database\r
@@ -82,10 +82,10 @@ public class BerlinModelTaxonIO {
                                }\r
                                \r
                                if (taxonName == null ){\r
-                                       //logger.warn("TaxonName belonging to taxon (RIdentifier = " + taxonId + ") could not be found in store. Taxon will not be transported");\r
+                                       logger.warn("TaxonName belonging to taxon (RIdentifier = " + taxonId + ") could not be found in store. Taxon will not be transported");\r
                                        continue;\r
                                }else if (reference == null ){\r
-                                       //logger.warn("Reference belonging to taxon could not be found in store. Taxon will not be imported");\r
+                                       logger.warn("Reference belonging to taxon could not be found in store. Taxon will not be imported");\r
                                        continue;\r
                                }else{\r
                                        TaxonBase taxonBase;\r
@@ -118,6 +118,10 @@ public class BerlinModelTaxonIO {
                                                        logger.warn("Doubtful = i (inactivated) not yet implemented. Doubtful set to false");\r
                                                }\r
                                                \r
+                                               //nameId\r
+                                               ImportHelper.setOriginalSource(taxonBase, bmiConfig.getSourceReference(), taxonId);\r
+\r
+                                               \r
                                                //TODO\r
                                                //\r
                                                //Created\r
@@ -145,18 +149,18 @@ public class BerlinModelTaxonIO {
        }\r
        \r
 \r
-       public static boolean invokeRelations(Source source, CdmApplicationController cdmApp, boolean deleteAll, \r
+       public static boolean invokeRelations(BerlinModelImportConfigurator bmiConfig, CdmApplicationController cdmApp, \r
                        MapWrapper<TaxonBase> taxonMap, MapWrapper<ReferenceBase> referenceMap){\r
 \r
                Set<TaxonBase> taxonStore = new HashSet<TaxonBase>();\r
-\r
+               Source source = bmiConfig.getSource();\r
                String dbAttrName;\r
                String cdmAttrName;\r
                \r
                logger.info("start makeTaxonRelationships ...");\r
                \r
                ITaxonService taxonService = cdmApp.getTaxonService();\r
-               boolean delete = deleteAll;\r
+               boolean delete = bmiConfig.isDeleteAll();\r
 \r
                try {\r
                        //get data from database\r