Revision 7373dcf3
Added by Andreas Müller over 4 years ago
| cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportBase.java | ||
|---|---|---|
| 20 | 20 |
|
| 21 | 21 |
import eu.etaxonomy.cdm.api.service.pager.Pager; |
| 22 | 22 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
| 23 |
import eu.etaxonomy.cdm.io.berlinModel.BerlinModelTransformer; |
|
| 24 | 23 |
import eu.etaxonomy.cdm.io.common.DbExportBase; |
| 25 | 24 |
import eu.etaxonomy.cdm.io.common.mapping.out.DbLastActionMapper; |
| 26 | 25 |
import eu.etaxonomy.cdm.io.pesi.erms.ErmsTransformer; |
| ... | ... | |
| 410 | 409 |
if (! taxon.isPublish()){
|
| 411 | 410 |
return false; |
| 412 | 411 |
} |
| 413 |
for (Marker marker : taxon.getMarkers()){
|
|
| 414 |
//probably not needed anymore after #1780 was fixed, also #4046 interesting |
|
| 415 |
if (marker.getValue() == false && marker.getMarkerType().equals(MarkerType.PUBLISH())){
|
|
| 416 |
return false; |
|
| 417 |
//probably not needed any more after #2786 was fixed |
|
| 418 |
}else if (marker.getValue() == true && marker.getMarkerType().getUuid().equals(BerlinModelTransformer.uuidMisappliedCommonName)){
|
|
| 419 |
logger.warn("Misapplied common name still exists");
|
|
| 420 |
return false; |
|
| 421 |
} |
|
| 422 |
} |
|
| 423 | 412 |
|
| 424 | 413 |
//handle PESI accepted taxa |
| 425 | 414 |
if (! taxon.isMisapplication()){
|
| ... | ... | |
| 434 | 423 |
if (excludeMisappliedNames){
|
| 435 | 424 |
return false; |
| 436 | 425 |
} |
| 437 |
for (Marker marker : taxon.getMarkers()){
|
|
| 438 |
//probably not needed any more after #2786 was fixed |
|
| 439 |
if (marker.getValue() == true && marker.getMarkerType().getUuid().equals(BerlinModelTransformer.uuidMisappliedCommonName)){
|
|
| 440 |
logger.warn("Misapplied common name still exists");
|
|
| 441 |
return false; |
|
| 442 |
} |
|
| 443 |
} |
|
| 444 | 426 |
for (TaxonRelationship taxRel : taxon.getRelationsFromThisTaxon()){
|
| 445 | 427 |
if (taxRel.getType().isAnyMisappliedName()){
|
| 446 | 428 |
// logger.warn(taxRel.getUuid() + "; " + taxRel.getToTaxon().getUuid() + " + " + taxRel.getToTaxon().getTitleCache()); |
Also available in: Unified diff
ref #2717 remove publish marker and uuidMisappliedCommonName marker handling because not needed anymore