Revision 9c021029
Added by Andreas Müller over 1 year ago
| cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java | ||
|---|---|---|
| 14 | 14 |
import java.util.Map; |
| 15 | 15 |
import java.util.Set; |
| 16 | 16 |
|
| 17 |
import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger; |
|
| 17 |
import org.apache.logging.log4j.LogManager; |
|
| 18 |
import org.apache.logging.log4j.Logger; |
|
| 18 | 19 |
import org.jdom.Element; |
| 19 | 20 |
import org.jdom.Namespace; |
| 20 | 21 |
import org.springframework.stereotype.Component; |
| ... | ... | |
| 194 | 195 |
private boolean doSpecimenType(TaxonXImportConfigurator config, Element elType, Element elTypeLoc, TaxonName taxonName){
|
| 195 | 196 |
Reference citation = null; |
| 196 | 197 |
String citationMicroReference = null; |
| 197 |
String originalNameString = null;
|
|
| 198 |
String originalInfo = null;
|
|
| 198 | 199 |
boolean isNotDesignated = true; |
| 199 | 200 |
boolean addToAllHomotypicNames = true; |
| 200 | 201 |
|
| ... | ... | |
| 212 | 213 |
if (typeLocMap != null && typeLocMap.size() >0){
|
| 213 | 214 |
for (DerivedUnit specimen : typeLocMap.keySet()){
|
| 214 | 215 |
SpecimenTypeDesignationStatus status = typeLocMap.get(specimen); |
| 215 |
taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames);
|
|
| 216 |
taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames);
|
|
| 216 | 217 |
} |
| 217 | 218 |
}else{ // no type_loc
|
| 218 | 219 |
SpecimenTypeDesignationStatus status = null; |
| 219 |
taxonName.addSpecimenTypeDesignation(simpleSpecimen.getSpecimen(), status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames);
|
|
| 220 |
taxonName.addSpecimenTypeDesignation(simpleSpecimen.getSpecimen(), status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames);
|
|
| 220 | 221 |
} |
| 221 | 222 |
return true; |
| 222 | 223 |
} |
| ... | ... | |
| 392 | 393 |
private boolean doNameTypeDesignation(TaxonName name, TaxonName type, NameTypeDesignationStatus status/*, boolean isLectoType*/){
|
| 393 | 394 |
Reference citation = null; |
| 394 | 395 |
String citationMicroReference = null; |
| 395 |
String originalNameString = null;
|
|
| 396 |
String originalInfo = null;
|
|
| 396 | 397 |
boolean addToAllHomotypicNames = true; |
| 397 | 398 |
|
| 398 |
// name.addNameTypeDesignation(type, citation, citationMicroReference, originalNameString, status, addToAllHomotypicNames);
|
|
| 399 |
name.addNameTypeDesignation(type, citation, citationMicroReference, originalNameString,status, false, false, /*isLectoType, */false, addToAllHomotypicNames);
|
|
| 399 |
// name.addNameTypeDesignation(type, citation, citationMicroReference, originalInfo, status, addToAllHomotypicNames);
|
|
| 400 |
name.addNameTypeDesignation(type, citation, citationMicroReference, originalInfo,status, false, false, /*isLectoType, */false, addToAllHomotypicNames);
|
|
| 400 | 401 |
return true; |
| 401 | 402 |
} |
| 402 | 403 |
|
| ... | ... | |
| 439 | 440 |
logger.warn("Is this really only a collection string? : " + tmpCollString + getBracketSourceName(config));
|
| 440 | 441 |
} |
| 441 | 442 |
DerivedUnit specimen; |
| 442 |
specimen = (DerivedUnit)originalSpecimen.clone();
|
|
| 443 |
specimen = originalSpecimen.clone(); |
|
| 443 | 444 |
String title = originalSpecimen.getTitleCache(); |
| 444 | 445 |
title = title + "(" + tmpCollString + ")";
|
| 445 | 446 |
specimen.setTitleCache(title, true ); |
| ... | ... | |
| 516 | 517 |
if (taxonName != null){
|
| 517 | 518 |
Reference citation = null; |
| 518 | 519 |
String citationMicroReference = null; |
| 519 |
String originalNameString = null;
|
|
| 520 |
String originalInfo = null;
|
|
| 520 | 521 |
boolean isNotDesignated = true; |
| 521 | 522 |
boolean addToAllHomotypicNames = true; |
| 522 |
DerivedUnit specimen = (DerivedUnit)originalSpecimen.clone();
|
|
| 523 |
DerivedUnit specimen = originalSpecimen.clone(); |
|
| 523 | 524 |
unlazyTypeDesignation(config, taxonName); |
| 524 |
taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalNameString, isNotDesignated, addToAllHomotypicNames);
|
|
| 525 |
taxonName.addSpecimenTypeDesignation(specimen, status, citation, citationMicroReference, originalInfo, isNotDesignated, addToAllHomotypicNames);
|
|
| 525 | 526 |
result = true; |
| 526 | 527 |
} |
| 527 | 528 |
} |
Also available in: Unified diff
ref #10097 change originalNameString to originalInfo in cdmlib