Revision ede99ce1
Added by Andreas Müller over 4 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java | ||
|---|---|---|
| 98 | 98 |
return doCreatedUpdatedNotes(state, annotatableEntity, rs, excludeUpdated, false); |
| 99 | 99 |
} |
| 100 | 100 |
|
| 101 |
protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, ResultSet rs, boolean excludeUpdated, boolean excludeNotes) |
|
| 101 |
protected boolean doCreatedUpdatedNotes(BerlinModelImportState state, AnnotatableEntity annotatableEntity, |
|
| 102 |
ResultSet rs, boolean excludeUpdated, boolean excludeNotes) |
|
| 102 | 103 |
throws SQLException{
|
| 103 | 104 |
|
| 104 | 105 |
BerlinModelImportConfigurator config = state.getConfig(); |
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonImport.java | ||
|---|---|---|
| 343 | 343 |
return false; |
| 344 | 344 |
} |
| 345 | 345 |
|
| 346 |
|
|
| 347 |
// logger.info( i + " names handled"); |
|
| 348 | 346 |
getTaxonService().save(taxaToSave); |
| 349 | 347 |
return success; |
| 350 | 348 |
} |
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java | ||
|---|---|---|
| 210 | 210 |
} |
| 211 | 211 |
|
| 212 | 212 |
//epithets |
| 213 |
if (rank != null && rank.isSupraGeneric()){
|
|
| 213 |
if (rank.isSupraGeneric()){
|
|
| 214 | 214 |
dbAttrName = "supraGenericName"; |
| 215 | 215 |
}else{
|
| 216 | 216 |
dbAttrName = "genus"; |
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java | ||
|---|---|---|
| 294 | 294 |
//TODO homo/hetero |
| 295 | 295 |
relQualifierFk == TAX_REL_IS_PROPARTE_HOMOTYPIC_SYNONYM_OF || |
| 296 | 296 |
relQualifierFk == TAX_REL_IS_PROPARTE_HETEROTYPIC_SYNONYM_OF ){
|
| 297 |
toTaxon.addProparteSynonym(fromTaxon, citation, microcitation);
|
|
| 297 |
toTaxon.addProparteSynonym(fromTaxon, citation, microcitation); |
|
| 298 | 298 |
}else if(relQualifierFk == TAX_REL_IS_PARTIAL_SYN_OF || |
| 299 | 299 |
//TODO homo/hetero |
| 300 | 300 |
relQualifierFk == TAX_REL_IS_PARTIAL_HOMOTYPIC_SYNONYM_OF || |
| ... | ... | |
| 322 | 322 |
if (relQualifierFk == TAX_REL_IS_SYNONYM_OF || |
| 323 | 323 |
relQualifierFk == TAX_REL_IS_HOMOTYPIC_SYNONYM_OF || |
| 324 | 324 |
relQualifierFk == TAX_REL_IS_HETEROTYPIC_SYNONYM_OF){
|
| 325 |
//pro parte already set by taxon mapping |
|
| 326 |
// }else if (relQualifierFk == TAX_REL_IS_PROPARTE_SYN_OF || |
|
| 327 |
// relQualifierFk == TAX_REL_IS_PROPARTE_HOMOTYPIC_SYNONYM_OF || |
|
| 328 |
// relQualifierFk == TAX_REL_IS_PROPARTE_HETEROTYPIC_SYNONYM_OF ){
|
|
| 329 |
// synonym.setProParte(true); |
|
| 330 |
// }else if(relQualifierFk == TAX_REL_IS_PARTIAL_SYN_OF || |
|
| 331 |
// relQualifierFk == TAX_REL_IS_PARTIAL_HOMOTYPIC_SYNONYM_OF || |
|
| 332 |
// relQualifierFk == TAX_REL_IS_PARTIAL_HETEROTYPIC_SYNONYM_OF ){
|
|
| 333 |
// synonym.setPartial(true); |
|
| 334 | 325 |
}else{
|
| 335 | 326 |
success = false; |
| 336 | 327 |
logger.warn("Synonym relationship type not yet implemented: " + relQualifierFk);
|
| ... | ... | |
| 445 | 436 |
Map<Object, Map<String, ? extends CdmBase>> maps = getRelatedObjectsForFlatPartition(rs); |
| 446 | 437 |
|
| 447 | 438 |
Map<String, TaxonBase> taxonMap = (Map<String, TaxonBase>) maps.get(BerlinModelTaxonImport.NAMESPACE); |
| 448 |
Map<Integer, Classification> classificationMap = new HashMap<Integer, Classification>();
|
|
| 439 |
Map<Integer, Classification> classificationMap = new HashMap<>(); |
|
| 449 | 440 |
|
| 450 | 441 |
rs = state.getConfig().getSource().getResultSet(sql); |
| 451 | 442 |
try {
|
Also available in: Unified diff
cleanup