Revision b313991f
Added by Andreas Müller over 4 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java | ||
|---|---|---|
| 352 | 352 |
} |
| 353 | 353 |
} |
| 354 | 354 |
|
| 355 |
|
|
| 356 |
/** |
|
| 357 |
* @param member |
|
| 358 |
* @return |
|
| 359 |
*/ |
|
| 360 | 355 |
private Person deduplicatePerson(BerlinModelImportState state, Person person) {
|
| 361 | 356 |
Person result = deduplicationHelper.getExistingAuthor(state, person); |
| 362 | 357 |
return result; |
| ... | ... | |
| 367 | 362 |
return result; |
| 368 | 363 |
} |
| 369 | 364 |
|
| 370 |
|
|
| 371 |
/** |
|
| 372 |
* @param member |
|
| 373 |
* @return |
|
| 374 |
*/ |
|
| 375 | 365 |
protected static boolean isEtAl(Person member) {
|
| 376 | 366 |
if (member != null && isEtAl(member.getTitleCache()) && isEtAl(member.getNomenclaturalTitle())){
|
| 377 | 367 |
return true; |
| ... | ... | |
| 408 | 398 |
return person; |
| 409 | 399 |
} |
| 410 | 400 |
|
| 411 |
/** |
|
| 412 |
* @param person |
|
| 413 |
*/ |
|
| 414 | 401 |
private void parsePerson(Person person, String str, boolean preliminary) {
|
| 415 | 402 |
String capWord = "\\p{javaUpperCase}\\p{javaLowerCase}{2,}";
|
| 416 | 403 |
String famStart = "(Le |D'|'t |Mc|Mac|Des |d'|Du |De )"; |
| ... | ... | |
| 471 | 458 |
|
| 472 | 459 |
@Override |
| 473 | 460 |
public Map<Object, Map<String, ? extends CdmBase>> getRelatedObjectsForPartition(ResultSet rs, BerlinModelImportState state) {
|
| 474 |
String nameSpace; |
|
| 475 |
Class<?> cdmClass;
|
|
| 476 |
Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<Object, Map<String, ? extends CdmBase>>();
|
|
| 461 |
|
|
| 462 |
String nameSpace;
|
|
| 463 |
Map<Object, Map<String, ? extends CdmBase>> result = new HashMap<>(); |
|
| 477 | 464 |
|
| 478 | 465 |
//person map |
| 479 | 466 |
Set<String> idInSourceList = makeAuthorIdList(rs); |
| 480 | 467 |
nameSpace = BerlinModelAuthorImport.NAMESPACE; |
| 481 |
cdmClass = Person.class; |
|
| 482 |
Map<String, Person> personMap = (Map<String, Person>)getCommonService().getSourcedObjectsByIdInSource(cdmClass, idInSourceList, nameSpace); |
|
| 468 |
Map<String, Person> personMap = getCommonService().getSourcedObjectsByIdInSourceC(Person.class, idInSourceList, nameSpace); |
|
| 483 | 469 |
result.put(nameSpace, personMap); |
| 484 | 470 |
|
| 485 | 471 |
return result; |
| ... | ... | |
| 564 | 550 |
} |
| 565 | 551 |
} |
| 566 | 552 |
|
| 567 |
|
|
| 568 | 553 |
@Override |
| 569 | 554 |
protected boolean doCheck(BerlinModelImportState state){
|
| 570 | 555 |
IOValidator<BerlinModelImportState> validator = new BerlinModelAuthorTeamImportValidator(); |
| 571 | 556 |
return validator.validate(state); |
| 572 | 557 |
} |
| 573 | 558 |
|
| 574 |
|
|
| 575 | 559 |
@Override |
| 576 | 560 |
protected boolean isIgnore(BerlinModelImportState state){
|
| 577 | 561 |
return ! state.getConfig().isDoAuthors(); |
| 578 | 562 |
} |
| 579 |
|
|
| 580 |
|
|
| 581 |
|
|
| 582 | 563 |
} |
Also available in: Unified diff
adapt some classes to new CommonService.getSourcedObjectSByIdInSource and cleanup