add NomStatus vocabulary for ICZN #4085

[cdmlib-apps.git] / app-import / src / main / java / eu / etaxonomy / cdm / io / caryo / CaryoTaxonImport.java

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
index 01eb110df4ef44abeb3f56c6330e018a818cb017..d384d66afa99d8c1dc7c0b5dfe0704ce2cfd7050 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/caryo/CaryoTaxonImport.java
@@ -29,6 +29,7 @@ import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 import eu.etaxonomy.cdm.model.common.Annotation;\r
 import eu.etaxonomy.cdm.model.common.CdmBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;\r
 import eu.etaxonomy.cdm.model.common.TimePeriod;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
@@ -47,16 +48,12 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 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.cache.name.BotanicNameDefaultCacheStrategy;\r
 import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
-import eu.etaxonomy.cdm.strategy.parser.INonViralNameParser;\r
-import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl;\r
 \r
 \r
 /**\r
  * @author a.mueller\r
  * @created 20.02.2010\r
- * @version 1.0\r
  */\r
 @Component\r
 public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImportConfigurator> {\r
@@ -179,7 +176,7 @@ public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImpor
                                \r
                                classification.addParentChild(parent, taxon, sec, null);\r
                                \r
-                               taxon.addSource(String.valueOf(taxonId), "NCUGenID", sec, null);\r
+                               taxon.addSource(OriginalSourceType.Import, String.valueOf(taxonId), "NCUGenID", sec, null);\r
                                \r
                                \r
                                \r
@@ -289,7 +286,7 @@ public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImpor
                if (StringUtils.isNotBlank(nomStatusStr)){\r
                        NomenclaturalStatusType nomStatusType;\r
                        try {\r
-                               nomStatusType = NomenclaturalStatusType.getNomenclaturalStatusTypeByAbbreviation(nomStatusStr);\r
+                               nomStatusType = NomenclaturalStatusType.getNomenclaturalStatusTypeByAbbreviation(nomStatusStr, name);\r
                        } catch (UnknownCdmTypeException e) {\r
                                if (nomStatusStr.startsWith("nom. rej. prop.")){\r
                                        nomStatusType = NomenclaturalStatusType.REJECTED_PROP();\r
@@ -754,7 +751,7 @@ public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImpor
                                BotanicalName name = BotanicalName.NewInstance(Rank.FAMILY());\r
                                name.setGenusOrUninomial(family);\r
                                Taxon taxon = Taxon.NewInstance(name, state.getTransactionalSourceReference());\r
-                               classification.addChildTaxon(taxon, null, null, null);\r
+                               classification.addChildTaxon(taxon, null, null);\r
        //                      taxon.addSource(id, idNamespace, citation, null);\r
                                \r
                                familyMap.put(family, taxon);\r
@@ -781,10 +778,8 @@ public class CaryoTaxonImport  extends DbImportBase<CaryoImportState, CaryoImpor
 \r
 \r
 \r
-       /* (non-Javadoc)\r
-        * @see eu.etaxonomy.cdm.io.berlinModel.in.IPartitionedIO#getRelatedObjectsForPartition(java.sql.ResultSet)\r
-        */\r
-       public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs) {\r
+       @Override\r
+       public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, CaryoImportState state) {\r
 //             String nameSpace;\r
 //             Class cdmClass;\r
 //             Set<String> idSet;\r