Revision 066bfef4
Added by Andreas Müller almost 7 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/greece/FloraHellenicaTaxonImport.java | ||
|---|---|---|
| 396 | 396 |
|
| 397 | 397 |
Taxon taxon = Taxon.NewInstance(name, getSecReference(state)); |
| 398 | 398 |
taxon.addImportSource(noStr, getWorksheetName(), getSourceCitation(state), null); |
| 399 |
// String parentStr = isSubSpecies ? makeSpeciesKey(genusStr, speciesStr, speciesAuthorStr) : genusStr; |
|
| 399 |
String parentStr = isSubSpecies ? |
|
| 400 |
makeSpeciesKey(genusStr, speciesStr, speciesAuthorStr) : genusStr; |
|
| 400 | 401 |
taxon.setUuid(uuid); |
| 401 |
String parentStr = genusStr; |
|
| 402 | 402 |
boolean genusAsBefore = genusStr.equals(lastGenus); |
| 403 | 403 |
boolean speciesAsBefore = speciesStr.equals(lastSpecies); |
| 404 | 404 |
TaxonNode parent = getParent(state, parentStr); |
| 405 | 405 |
if (parent != null){
|
| 406 |
// if (!isSubSpecies && genusAsBefore || isSubSpecies && speciesAsBefore){
|
|
| 407 |
if (genusAsBefore ){
|
|
| 408 |
//everything as expected
|
|
| 406 |
if (!isSubSpecies && genusAsBefore || isSubSpecies && speciesAsBefore){
|
|
| 407 |
// if (genusAsBefore ){
|
|
| 408 |
//everything as expected |
|
| 409 | 409 |
TaxonNode newNode = parent.addChildTaxon(taxon, getSecReference(state), null); |
| 410 |
getTaxonNodeService().save(newNode); |
|
| 410 |
getTaxonNodeService().saveOrUpdate(newNode);
|
|
| 411 | 411 |
}else{
|
| 412 | 412 |
logger.warn(line + "Unexpected non-missing parent"); |
| 413 | 413 |
} |
| 414 | 414 |
}else{
|
| 415 |
// if (isSubSpecies){
|
|
| 416 |
// logger.warn(line + "Subspecies should always have an existing parent"); |
|
| 417 |
// }else |
|
| 418 |
if (genusAsBefore){
|
|
| 415 |
if (isSubSpecies){
|
|
| 416 |
logger.warn(line + "Subspecies should always have an existing parent"); |
|
| 417 |
}else if (genusAsBefore){
|
|
| 419 | 418 |
logger.warn(line + "Unexpected missing genus parent"); |
| 420 | 419 |
}else{
|
| 421 | 420 |
parent = makeGenusNode(state, record, genusStr); |
Also available in: Unified diff
ref #6286 latest changes for Flora of Greece import