Revision 2abd2851
Added by Andreas Müller over 3 years ago
cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/validate/PesiErmsValidator.java | ||
---|---|---|
332 | 332 |
//TODO success &= equals("Taxon TypeFullNameCache", CdmUtils.concat(" ", srcRS.getString("typename"), srcRS.getString("typeauthor")), destRS.getString("TypeFullNameCache"), id); |
333 | 333 |
success &= equals("Taxon QualityStatusFK", nullSafeInt(srcRS, "tu_qualitystatus"),nullSafeInt( destRS,"QualityStatusFk"), String.valueOf(id)); |
334 | 334 |
success &= equals("Taxon QualityStatusCache", srcRS.getString("qualitystatus_name"), destRS.getString("QualityStatusCache"), id); |
335 |
success &= checkTreeIndex(destRS, ("TreeIndex"), ("pTreeIndex"), id);
|
|
335 |
success &= testTreeIndex(destRS, ("TreeIndex"), ("pTreeIndex"), id);
|
|
336 | 336 |
success &= equals("Taxon FossilStatusFk", nullSafeInt(srcRS, "tu_fossil"),nullSafeInt( destRS,"FossilStatusFk"), String.valueOf(id)); |
337 | 337 |
success &= equals("Taxon FossilStatusCache", srcRS.getString("fossil_name"), destRS.getString("FossilStatusCache"), id); |
338 | 338 |
success &= equals("Taxon GUID", srcRS.getString("GUID"), destRS.getString("GUID"), id); |
... | ... | |
357 | 357 |
return -1; |
358 | 358 |
} |
359 | 359 |
|
360 |
private boolean checkTreeIndex(ResultSet destRS, String childIndexAttr, String parentIndexAttr, String id) throws SQLException {
|
|
360 |
private boolean testTreeIndex(ResultSet destRS, String childIndexAttr, String parentIndexAttr, String id) throws SQLException {
|
|
361 | 361 |
boolean result; |
362 | 362 |
int taxonStatusFk = destRS.getInt("TaxonStatusFk"); |
363 | 363 |
String parentTaxonId = destRS.getString("parentTaxonFk"); |
364 | 364 |
int rankFk = destRS.getInt("RankFk"); |
365 |
if (taxonStatusFk == 2 || rankFk <= 10){ //synonyms, Kingdom and higher
|
|
365 |
if (taxonStatusFk == 2 || taxonStatusFk == 4 || rankFk <= 10){ //synonym; pro parte syn; kingdom and higher
|
|
366 | 366 |
result = isNull(childIndexAttr, destRS); |
367 | 367 |
}else{ |
368 | 368 |
String childIndex = destRS.getString(childIndexAttr); |
... | ... | |
807 | 807 |
return "informal reference"; |
808 | 808 |
}else if ("p".equals(sourceType)){ |
809 | 809 |
return "publication"; |
810 |
}else if ("i".equals(sourceType)){ |
|
811 |
//TODO |
|
812 |
return "i"; |
|
813 | 810 |
} |
814 | 811 |
return null; |
815 | 812 |
} |
Also available in: Unified diff
ref #8508 improve treeindex validation and remove source type 'i' handling