Revision 892efc69
Added by Andreas Kohlbecker almost 14 years ago
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java | ||
---|---|---|
31 | 31 |
import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; |
32 | 32 |
import eu.etaxonomy.cdm.model.taxon.Taxon; |
33 | 33 |
import eu.etaxonomy.cdm.model.taxon.TaxonBase; |
34 |
import eu.etaxonomy.cdm.model.taxon.TaxonNode; |
|
34 | 35 |
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; |
35 | 36 |
import eu.etaxonomy.cdm.model.taxon.TaxonomicTree; |
36 | 37 |
import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException; |
... | ... | |
296 | 297 |
} |
297 | 298 |
|
298 | 299 |
private boolean makeTaxonomicallyIncluded(TcsXmlImportState state, Taxon toTaxon, Taxon fromTaxon, ReferenceBase citation, String microCitation){ |
299 |
boolean success = true; |
|
300 | 300 |
ReferenceBase sec = toTaxon.getSec(); |
301 | 301 |
TaxonomicTree tree = state.getTree(sec); |
302 | 302 |
if (tree == null){ |
303 | 303 |
tree = makeTree(state, sec); |
304 | 304 |
} |
305 |
success = tree.addParentChild(toTaxon, fromTaxon, citation, microCitation);
|
|
306 |
return success;
|
|
305 |
TaxonNode childNode = tree.addParentChild(toTaxon, fromTaxon, citation, microCitation);
|
|
306 |
return (childNode != null);
|
|
307 | 307 |
} |
308 | 308 |
|
309 | 309 |
|
... | ... | |
325 | 325 |
String title = elToTaxonConcept.getTextNormalize(); |
326 | 326 |
//TODO synonym? |
327 | 327 |
TaxonNameBase<?,?> taxonName = NonViralName.NewInstance(null); |
328 |
taxonName.setTitleCache(title); |
|
328 |
taxonName.setTitleCache(title, true);
|
|
329 | 329 |
logger.warn("Free text related taxon seems to be bug in TCS"); |
330 | 330 |
if (isSynonym){ |
331 | 331 |
result = Synonym.NewInstance(taxonName, TcsXmlTaxonImport.unknownSec()); |
332 | 332 |
}else{ |
333 | 333 |
result = Taxon.NewInstance(taxonName, TcsXmlTaxonImport.unknownSec()); |
334 | 334 |
} |
335 |
result.setTitleCache(title); |
|
335 |
result.setTitleCache(title, true);
|
|
336 | 336 |
} |
337 | 337 |
}else{ |
338 | 338 |
logger.warn("External link types for synonym not yet implemented"); |
Also available in: Unified diff
merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk