last updates for Taxon Excel Import and moving all success variables to state

[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 5c359c6f4edc9043d8992cf6382ee68810ea608a..c47d9bbaae10cd5e18b2b4a71381c12bfefefc03 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
@@ -121,10 +121,9 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
        \r
        \r
        @Override\r
-    protected boolean analyzeRecord(HashMap<String, String> record, CyprusImportState state) {\r
+    protected void analyzeRecord(HashMap<String, String> record, CyprusImportState state) {\r
                \r
-               boolean success = true;\r
-       Set<String> keys = record.keySet();\r
+               Set<String> keys = record.keySet();\r
        \r
        CyprusRow cyprusRow = new CyprusRow();\r
        state.setCyprusRow(cyprusRow);\r
@@ -189,11 +188,11 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
                                cyprusRow.setDivision(value);\r
                        \r
                        } else {\r
-                               success = false;\r
+                               state.setUnsuccessfull();\r
                                logger.error("Unexpected column header " + key);\r
                        }\r
        }\r
-       return success;\r
+       return;\r
     }\r
        \r
        private static INonViralNameParser nameParser = NonViralNameParserImpl.NewInstance();\r
@@ -232,44 +231,44 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
                                //status\r
                                \r
                                UUID indigenousUuid = transformer.getPresenceTermUuid("IN");\r
-                               indigenous = this.getPresenceTerm(state, indigenousUuid, "Indigenous", "Indigenous", "IN");\r
+                               indigenous = this.getPresenceTerm(state, indigenousUuid, "indigenous", "Indigenous", "IN");\r
                                getTermService().save(indigenous);\r
                                UUID indigenousDoubtfulUuid = transformer.getPresenceTermUuid("IN?");\r
-                               indigenousDoubtful = this.getPresenceTerm(state, indigenousDoubtfulUuid, "Indigenous?", "Indigenous?", "IN?");\r
+                               indigenousDoubtful = this.getPresenceTerm(state, indigenousDoubtfulUuid, "indigenous?", "Indigenous?", "IN?");\r
                                getTermService().save(indigenousDoubtful);\r
 \r
                                UUID cultivatedDoubtfulUuid = transformer.getPresenceTermUuid("CU?");\r
-                               cultivatedDoubtful = this.getPresenceTerm(state, cultivatedDoubtfulUuid, "Cultivated?", "Cultivated?", "CU?");\r
+                               cultivatedDoubtful = this.getPresenceTerm(state, cultivatedDoubtfulUuid, "cultivated?", "Cultivated?", "CU?");\r
                                getTermService().save(cultivatedDoubtful);\r
                                \r
                                \r
                                UUID casualUuid = transformer.getPresenceTermUuid("CA");\r
-                               casual = this.getPresenceTerm(state, casualUuid, "Casual", "Casual", "CA");\r
+                               casual = this.getPresenceTerm(state, casualUuid, "casual", "Casual", "CA");\r
                                getTermService().save(casual);\r
                                UUID casualDoubtfulUuid = transformer.getPresenceTermUuid("CA?");\r
-                               casualDoubtful = this.getPresenceTerm(state, casualDoubtfulUuid, "Casual?", "Casual?", "CA?");\r
+                               casualDoubtful = this.getPresenceTerm(state, casualDoubtfulUuid, "casual?", "Casual?", "CA?");\r
                                getTermService().save(casualDoubtful);\r
 \r
                                \r
                                UUID nonInvasiveUuid = transformer.getPresenceTermUuid("NN");\r
-                               nonInvasive = this.getPresenceTerm(state, nonInvasiveUuid, "Naturalized  non-invasive", "Naturalized  non-invasive", "NN");\r
+                               nonInvasive = this.getPresenceTerm(state, nonInvasiveUuid, "naturalized  non-invasive", "Naturalized  non-invasive", "NN");\r
                                getTermService().save(nonInvasive);\r
                                UUID nonInvasiveDoubtfulUuid = transformer.getPresenceTermUuid("NN?");\r
-                               nonInvasiveDoubtful = this.getPresenceTerm(state, nonInvasiveDoubtfulUuid, "Naturalized  non-invasive?", "Naturalized  non-invasive?", "NN?");\r
+                               nonInvasiveDoubtful = this.getPresenceTerm(state, nonInvasiveDoubtfulUuid, "naturalized  non-invasive?", "Naturalized  non-invasive?", "NN?");\r
                                getTermService().save(nonInvasiveDoubtful);\r
        \r
                                UUID invasiveUuid = transformer.getPresenceTermUuid("NA");\r
-                               invasive = this.getPresenceTerm(state, invasiveUuid, "Naturalized  invasive", "Naturalized  invasive", "NA");\r
+                               invasive = this.getPresenceTerm(state, invasiveUuid, "naturalized  invasive", "Naturalized  invasive", "NA");\r
                                getTermService().save(invasive);\r
                                UUID invasiveDoubtfulUuid = transformer.getPresenceTermUuid("NA?");\r
-                               invasiveDoubtful = this.getPresenceTerm(state, invasiveDoubtfulUuid, "Naturalized  invasive?", "Naturalized  invasive?", "NA?");\r
+                               invasiveDoubtful = this.getPresenceTerm(state, invasiveDoubtfulUuid, "naturalized  invasive?", "Naturalized  invasive?", "NA?");\r
                                getTermService().save(invasiveDoubtful);\r
        \r
                                UUID questionableUuid = transformer.getPresenceTermUuid("Q");\r
-                               questionable = this.getPresenceTerm(state, questionableUuid, "Questionable", "Questionable", "Q");\r
+                               questionable = this.getPresenceTerm(state, questionableUuid, "questionable", "Questionable", "Q");\r
                                getTermService().save(questionable);\r
                                UUID questionableDoubtfulUuid = transformer.getPresenceTermUuid("Q?");\r
-                               questionableDoubtful = this.getPresenceTerm(state, questionableDoubtfulUuid, "Questionable?", "Questionable?", "Q?");\r
+                               questionableDoubtful = this.getPresenceTerm(state, questionableDoubtfulUuid, "questionable?", "Questionable?", "Q?");\r
                                getTermService().save(questionableDoubtful);\r
                                \r
                                termsCreated = true;\r
@@ -288,9 +287,8 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
         *  Stores taxa records in DB\r
         */\r
        @Override\r
-    protected boolean firstPass(CyprusImportState state) {\r
+    protected void firstPass(CyprusImportState state) {\r
                \r
-               boolean success = true;\r
                makeTerms(state);\r
                CyprusRow taxonLight = state.getCyprusRow();\r
                Reference citation = null;\r
@@ -346,7 +344,7 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
 //                     state.putHigherTaxon(higherName, uuid);//(speciesStr, mainTaxon);\r
                        getTaxonService().save(mainTaxon);\r
                }\r
-               return success;\r
+               return;\r
     }\r
 \r
 \r
@@ -501,11 +499,9 @@ public class CyprusExcelImport extends ExcelImporterBase<CyprusImportState> {
         *  Stores parent-child, synonym and common name relationships\r
         */\r
        @Override\r
-    protected boolean secondPass(CyprusImportState state) {\r
-               boolean success = true;\r
+    protected void secondPass(CyprusImportState state) {\r
 //             CyprusRow cyprusRow = state.getCyprusRow();\r
-\r
-               return success;\r
+               return;\r
        }\r
 \r
 \r