Revision 4b88f183
Added by Andreas Müller almost 2 years ago
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java | ||
|---|---|---|
| 292 | 292 |
} |
| 293 | 293 |
|
| 294 | 294 |
protected void checkTeamNomenclaturalTitle(Team team, String authorTeamCache, int authorTeamId) {
|
| 295 |
if (team.getCacheStrategy().getNomenclaturalTitleCache(team).equals(authorTeamCache)){
|
|
| 295 |
if (team.cacheStrategy().getNomenclaturalTitleCache(team).equals(authorTeamCache)){
|
|
| 296 | 296 |
team.setProtectedNomenclaturalTitleCache(false); |
| 297 |
}else if(team.getCacheStrategy().getNomenclaturalTitleCache(team).replace(" ,", ",").equals(authorTeamCache)){
|
|
| 297 |
}else if(team.cacheStrategy().getNomenclaturalTitleCache(team).replace(" ,", ",").equals(authorTeamCache)){
|
|
| 298 | 298 |
//also accept teams with ' , ' as separator as not protected |
| 299 | 299 |
team.setProtectedNomenclaturalTitleCache(false); |
| 300 | 300 |
}else{
|
| 301 | 301 |
team.setNomenclaturalTitleCache(authorTeamCache, true); |
| 302 |
logger.warn("Creation of nomTitle for team with members did not work: " + authorTeamCache + " <-> " + team.getCacheStrategy().getNomenclaturalTitleCache(team)+ " : " + authorTeamId);
|
|
| 302 |
logger.warn("Creation of nomTitle for team with members did not work: " + authorTeamCache + " <-> " + team.cacheStrategy().getNomenclaturalTitleCache(team)+ " : " + authorTeamId);
|
|
| 303 | 303 |
} |
| 304 | 304 |
} |
| 305 | 305 |
|
| 306 | 306 |
protected void checkTeamTitleCache(Team team, String fullAuthorTeamCache, int authorTeamId) {
|
| 307 |
INomenclaturalAuthorCacheStrategy<Team> formatter = team.getCacheStrategy();
|
|
| 307 |
INomenclaturalAuthorCacheStrategy<Team> formatter = team.cacheStrategy();
|
|
| 308 | 308 |
if (team.generateTitle().equals(fullAuthorTeamCache)){
|
| 309 | 309 |
team.setProtectedTitleCache(false); |
| 310 | 310 |
}else if(fullAuthorTeamCache == null){
|
| app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java | ||
|---|---|---|
| 1214 | 1214 |
} |
| 1215 | 1215 |
|
| 1216 | 1216 |
private static void checkTeam(Team team, String refAuthorString, Integer refId) {
|
| 1217 |
TeamDefaultCacheStrategy formatter = (TeamDefaultCacheStrategy) team.getCacheStrategy();
|
|
| 1217 |
TeamDefaultCacheStrategy formatter = (TeamDefaultCacheStrategy) team.cacheStrategy();
|
|
| 1218 | 1218 |
|
| 1219 | 1219 |
if (formatter.getTitleCache(team).equals(refAuthorString)){
|
| 1220 | 1220 |
team.setProtectedTitleCache(false); |
| ... | ... | |
| 1234 | 1234 |
} |
| 1235 | 1235 |
|
| 1236 | 1236 |
private static void checkPerson(Person person, String refAuthorString, boolean hasDedupMember, Integer refId) {
|
| 1237 |
PersonDefaultCacheStrategy formatter = (PersonDefaultCacheStrategy) person.getCacheStrategy();
|
|
| 1237 |
PersonDefaultCacheStrategy formatter = (PersonDefaultCacheStrategy) person.cacheStrategy();
|
|
| 1238 | 1238 |
|
| 1239 | 1239 |
String oldTitleCache = person.getTitleCache(); |
| 1240 | 1240 |
boolean oldTitleCacheProtected = person.isProtectedTitleCache(); |
Also available in: Unified diff
adapt BerlinModelImport to new cacheStrategy getter