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
\r
@Override\r
protected boolean isIgnore(CyprusImportState state) {\r
- return state.getConfig().isDoTaxa();\r
+ return ! state.getConfig().isDoTaxa();\r
}\r
\r
\r
\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
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
- 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
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
\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
* 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
// state.putHigherTaxon(higherName, uuid);//(speciesStr, mainTaxon);\r
getTaxonService().save(mainTaxon);\r
}\r
- return success;\r
+ return;\r
}\r
\r
\r
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
}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
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
* 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
BGBM BDI Projects / cdmlib-apps.git / blobdiff