Revision 92a5fd30
Added by Andreas Müller almost 6 years ago
| cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java | ||
|---|---|---|
| 298 | 298 |
public ModelAndView doGetSynonymy(@PathVariable("uuid") UUID uuid,
|
| 299 | 299 |
HttpServletRequest request, HttpServletResponse response)throws IOException {
|
| 300 | 300 |
|
| 301 |
boolean includeUnpublished = NO_UNPUBLISHED; |
|
| 301 | 302 |
if(request != null){
|
| 302 | 303 |
logger.info("doGetSynonymy() " + requestPathAndQuery(request));
|
| 303 | 304 |
} |
| ... | ... | |
| 307 | 308 |
|
| 308 | 309 |
//new |
| 309 | 310 |
List<List<Synonym>> synonymyGroups = service.getSynonymsByHomotypicGroup(taxon, SYNONYMY_INIT_STRATEGY); |
| 311 |
if(!includeUnpublished){
|
|
| 312 |
removeUnpublishedSynonyms(synonymyGroups); |
|
| 313 |
} |
|
| 314 |
|
|
| 310 | 315 |
synonymy.put("homotypicSynonymsByHomotypicGroup", synonymyGroups.get(0));
|
| 311 | 316 |
synonymyGroups.remove(0); |
| 312 | 317 |
synonymy.put("heterotypicSynonymyGroups", synonymyGroups);
|
| ... | ... | |
| 320 | 325 |
} |
| 321 | 326 |
|
| 322 | 327 |
|
| 328 |
/** |
|
| 329 |
* @param synonymyGroups |
|
| 330 |
*/ |
|
| 331 |
private List<List<Synonym>> removeUnpublishedSynonyms(List<List<Synonym>> synonymyGroups) {
|
|
| 332 |
List<List<Synonym>> result = new ArrayList<>(); |
|
| 333 |
for (List<Synonym> oldList : synonymyGroups){
|
|
| 334 |
List<Synonym> newList = new ArrayList<>(); |
|
| 335 |
for (Synonym oldSyn : oldList){
|
|
| 336 |
if (oldSyn.isPublish()){
|
|
| 337 |
newList.add(oldSyn); |
|
| 338 |
} |
|
| 339 |
} |
|
| 340 |
if (!newList.isEmpty()){
|
|
| 341 |
result.add(newList); |
|
| 342 |
} |
|
| 343 |
} |
|
| 344 |
return result; |
|
| 345 |
} |
|
| 346 |
|
|
| 323 | 347 |
/** |
| 324 | 348 |
* {@inheritDoc}
|
| 325 | 349 |
*/ |
Also available in: Unified diff
ref #3560 remove unpublished synonyms from taxon.synonymy