Project

General

Profile

« Previous | Next » 

Revision 7fe80463

Added by Andreas Müller almost 5 years ago

set parent-child references to null in E+M import if same as sec

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java
298 298
							}
299 299
							Taxon fromTaxon = (Taxon)taxon1;
300 300
							if (relQualifierFk == TAX_REL_IS_INCLUDED_IN){
301
								taxonRelationship = makeTaxonomicallyIncluded(state, classificationMap, treeRefFk, fromTaxon, toTaxon, citation, microcitation);
301
								if(state.getConfig().isEuroMed() && CdmUtils.nullSafeEqual(relRefFk, ptRefFk1)){
302
								    citation = null;
303
								}
304
							    taxonRelationship = makeTaxonomicallyIncluded(state, classificationMap, treeRefFk, fromTaxon, toTaxon, citation, microcitation);
302 305
							}else if (relQualifierFk == TAX_REL_IS_MISAPPLIED_NAME_OF){
303 306
								boolean isProParte = "p.p.".equals(notes);
304 307
							    if (isProParte){
......
754 757
		}
755 758
	}
756 759

  
757
	private TaxonNode makeTaxonomicallyIncluded(BerlinModelImportState state, Map<Integer, Classification> classificationMap, int treeRefFk, Taxon child, Taxon parent, Reference citation, String microCitation){
760
	private TaxonNode makeTaxonomicallyIncluded(BerlinModelImportState state, Map<Integer, Classification> classificationMap,
761
	        int treeRefFk, Taxon child, Taxon parent, Reference citation, String microCitation){
758 762
		Classification tree = getClassificationTree(state, classificationMap, treeRefFk);
759 763
		return tree.addParentChild(parent, child, citation, microCitation);
760 764
	}

Also available in: Unified diff