Revision fde70ecd
Added by Andreas Müller almost 5 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelCommonNamesImport.java | ||
|---|---|---|
| 465 | 465 |
language = Language.UNKNOWN_LANGUAGE(); |
| 466 | 466 |
} else if ("Majorcan".equalsIgnoreCase(languageString)){
|
| 467 | 467 |
language = getLanguage(state, BerlinModelTransformer.uuidLangMajorcan, "Majorcan", "Majorcan (original 'mallorqu\u00EDn')", null); |
| 468 |
}else{
|
|
| 468 |
} else if ("High Aragonese".equalsIgnoreCase(languageString)){
|
|
| 469 |
language = getLanguage(state, BerlinModelTransformer.uuidLangHighAragonese, "High Aragonese", "High Aragonese (original 'altoaragonés')", null); |
|
| 470 |
} else if ("Valencian".equalsIgnoreCase(languageString)){
|
|
| 471 |
language = getLanguage(state, BerlinModelTransformer.uuidLangValencian, "Valencian", "Valencian (original 'valenciano')", null); |
|
| 472 |
}else{
|
|
| 469 | 473 |
logger.warn("language ISO 639_1 and ISO 639_2 were empty for " + languageString);
|
| 470 | 474 |
language = null; |
| 471 | 475 |
} |
| ... | ... | |
| 582 | 586 |
|
| 583 | 587 |
NamedArea area = emCodeToAreaMap.get(emCode); |
| 584 | 588 |
if (area == null){
|
| 589 |
area = normalizeAmbigousAreas(emCode, emCodeToAreaMap); |
|
| 590 |
} |
|
| 591 |
if (area == null){
|
|
| 592 |
|
|
| 585 | 593 |
String[] splits = emCode.split("/");
|
| 586 | 594 |
if (splits.length == 2){
|
| 587 | 595 |
area = emCodeToAreaMap.get(splits[0]); |
| 588 | 596 |
} |
| 589 | 597 |
if (area != null){
|
| 590 |
logger.warn("emCode ambigous. Use larger area: " + CdmUtils.Nz(emCode) + "->" + regionId);
|
|
| 598 |
logger.warn("emCode ambigous. This should not happen anymore due to normalization! Use larger area as default: " + CdmUtils.Nz(emCode) + "->" + regionId);
|
|
| 591 | 599 |
}else{
|
| 592 | 600 |
logger.warn("emCode not recognized. Region not defined: " + CdmUtils.Nz(emCode) + "->" + regionId);
|
| 593 | 601 |
} |
| ... | ... | |
| 600 | 608 |
} |
| 601 | 609 |
|
| 602 | 610 |
/** |
| 611 |
* Use area according to mail ERS 2018-09-24 |
|
| 612 |
* @param emCodeToAreaMap |
|
| 613 |
*/ |
|
| 614 |
private NamedArea normalizeAmbigousAreas(String emCode, Map<String, NamedArea> emCodeToAreaMap) {
|
|
| 615 |
if (emCode == null){
|
|
| 616 |
return null; |
|
| 617 |
}else if (emCode.equals("Ar/Ar(A)")){
|
|
| 618 |
return emCodeToAreaMap.get("Ar");
|
|
| 619 |
}else if (emCode.equals("Ab/Ab(A)")){
|
|
| 620 |
return emCodeToAreaMap.get("Ab");
|
|
| 621 |
}else if (emCode.equals("Ga/Ga(F)")){
|
|
| 622 |
return emCodeToAreaMap.get("Ga(F)");
|
|
| 623 |
}else if (emCode.equals("Hb/Hb(E)")){
|
|
| 624 |
return emCodeToAreaMap.get("Hb");
|
|
| 625 |
}else if (emCode.equals("It/It(I)")){
|
|
| 626 |
return emCodeToAreaMap.get("It");
|
|
| 627 |
}else if (emCode.equals("Uk/Uk(U)")){
|
|
| 628 |
return emCodeToAreaMap.get("Uk(U)");
|
|
| 629 |
}else if (emCode.equals("Hs/Hs(S)")){
|
|
| 630 |
return emCodeToAreaMap.get("Hs(S)");
|
|
| 631 |
} |
|
| 632 |
return null; |
|
| 633 |
} |
|
| 634 |
|
|
| 635 |
/** |
|
| 603 | 636 |
* @param regionFks |
| 604 | 637 |
* @return |
| 605 | 638 |
*/ |
Also available in: Unified diff
fix ambigous common name areas and special Spanish languages