Correct publish flag import for BM import

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

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
index c47d9bbaae10cd5e18b2b4a71381c12bfefefc03..9554f00404f07b1da63b05f8f4205f9657e79bfa 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/io/cyprus/CyprusExcelImport.java
@@ -21,17 +21,17 @@ import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;\r
 \r
 import eu.etaxonomy.cdm.common.CdmUtils;\r
+import eu.etaxonomy.cdm.io.common.TdwgAreaProvider;\r
 import eu.etaxonomy.cdm.io.common.mapping.IInputTransformer;\r
 import eu.etaxonomy.cdm.io.common.mapping.UndefinedTransformerMethodException;\r
 import eu.etaxonomy.cdm.io.excel.common.ExcelImporterBase;\r
 import eu.etaxonomy.cdm.model.common.Language;\r
 import eu.etaxonomy.cdm.model.description.Distribution;\r
 import eu.etaxonomy.cdm.model.description.Feature;\r
-import eu.etaxonomy.cdm.model.description.PresenceTerm;\r
+import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.location.NamedArea;\r
-import eu.etaxonomy.cdm.model.location.TdwgArea;\r
 import eu.etaxonomy.cdm.model.name.BotanicalName;\r
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;\r
 import eu.etaxonomy.cdm.model.name.NonViralName;\r
@@ -196,21 +196,21 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
     }\r
        \r
        private static INonViralNameParser nameParser = NonViralNameParserImpl.NewInstance();\r
-       private static NomenclaturalCode nc = NomenclaturalCode.ICBN;\r
+       private static NomenclaturalCode nc = NomenclaturalCode.ICNAFP;\r
        private Feature redBookCategory;\r
        private Feature endemism;\r
-       private PresenceTerm indigenous;\r
-       private PresenceTerm indigenousDoubtful;\r
-       private PresenceTerm cultivatedDoubtful;\r
+       private PresenceAbsenceTerm indigenous;\r
+       private PresenceAbsenceTerm indigenousDoubtful;\r
+       private PresenceAbsenceTerm cultivatedDoubtful;\r
        \r
-       private PresenceTerm casual;\r
-       private PresenceTerm casualDoubtful;\r
-       private PresenceTerm nonInvasive;\r
-       private PresenceTerm nonInvasiveDoubtful;\r
-       private PresenceTerm invasive;\r
-       private PresenceTerm invasiveDoubtful;\r
-       private PresenceTerm questionable;\r
-       private PresenceTerm questionableDoubtful;\r
+       private PresenceAbsenceTerm casual;\r
+       private PresenceAbsenceTerm casualDoubtful;\r
+       private PresenceAbsenceTerm nonInvasive;\r
+       private PresenceAbsenceTerm nonInvasiveDoubtful;\r
+       private PresenceAbsenceTerm invasive;\r
+       private PresenceAbsenceTerm invasiveDoubtful;\r
+       private PresenceAbsenceTerm questionable;\r
+       private PresenceAbsenceTerm questionableDoubtful;\r
        \r
        private boolean termsCreated = false;\r
        \r
@@ -221,11 +221,11 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
                        try {\r
                                //feature\r
                                UUID redBookUuid = transformer.getFeatureUuid("Red book");\r
-                               redBookCategory = this.getFeature(state, redBookUuid, "Red book category", "Red data book category", "Red book");\r
+                               redBookCategory = this.getFeature(state, redBookUuid, "Red book category", "Red data book category", "Red book", null);\r
                                getTermService().save(redBookCategory);\r
                                \r
                                UUID endemismUuid = transformer.getFeatureUuid("Endemism");\r
-                               endemism = this.getFeature(state, endemismUuid, "Endemism", "Endemism", "Endemism");\r
+                               endemism = this.getFeature(state, endemismUuid, "Endemism", "Endemism", "Endemism", null);\r
                                getTermService().save(endemism);\r
                                \r
                                //status\r
@@ -436,7 +436,7 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
        private void makeStatus(String statusString, Taxon mainTaxon) {\r
                //status\r
                if (StringUtils.isNotBlank(statusString)){\r
-                       PresenceTerm status = null;\r
+                       PresenceAbsenceTerm status = null;\r
                        if (statusString.contains("Indigenous?")){\r
                                status = indigenousDoubtful;\r
                        }else if (statusString.contains("Indigenous")){\r
@@ -448,7 +448,7 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
                        }else if (statusString.contains("Cultivated?")){\r
                                status = cultivatedDoubtful;\r
                        }else if (statusString.contains("Cultivated")){\r
-                               status = PresenceTerm.CULTIVATED();\r
+                               status = PresenceAbsenceTerm.CULTIVATED();\r
                        }else if (statusString.contains("non-invasive?")){\r
                                status = nonInvasiveDoubtful;\r
                        }else if (statusString.contains("non-invasive")){\r
@@ -470,7 +470,7 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
                                status = null;\r
                        }\r
                        TaxonDescription td = this.getTaxonDescription(mainTaxon, false, true);\r
-                       NamedArea area = TdwgArea.getAreaByTdwgAbbreviation("CYP");\r
+                       NamedArea area = TdwgAreaProvider.getAreaByTdwgAbbreviation("CYP");\r
                        Distribution distribution = Distribution.NewInstance(area, status);\r
                        td.addElement(distribution);\r
                        \r