Project

General

Profile

« Previous | Next » 

Revision 3e0f59b5

Added by Andreas Müller almost 5 years ago

set all taxrel 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
263 263
				Integer taxon1Id = nullSafeInt(rs, "taxon1Id");
264 264
				Integer taxon2Id = nullSafeInt(rs, "taxon2Id");
265 265
				Integer ptRefFk1 = nullSafeInt(rs, "PTRefFk1");
266
				Integer ptRefFk2 = nullSafeInt(rs, "PTRefFk2");
266 267

  
267 268
				int relQualifierFk = -1;
268 269
				try {
......
296 297
								success = false;
297 298
								continue;
298 299
							}
300
                            if(state.getConfig().isEuroMed() && CdmUtils.nullSafeEqual(relRefFk, ptRefFk2)){
301
                                citation = null;
302
                            }
299 303
							Taxon fromTaxon = (Taxon)taxon1;
300 304
							if (relQualifierFk == TAX_REL_IS_INCLUDED_IN){
301
								if(state.getConfig().isEuroMed() && CdmUtils.nullSafeEqual(relRefFk, ptRefFk1)){
302
								    citation = null;
303
								}
304 305
							    taxonRelationship = makeTaxonomicallyIncluded(state, classificationMap, treeRefFk, fromTaxon, toTaxon, citation, microcitation);
305 306
							}else if (relQualifierFk == TAX_REL_IS_MISAPPLIED_NAME_OF){
306
								boolean isProParte = "p.p.".equals(notes);
307
							    boolean isProParte = "p.p.".equals(notes);
307 308
							    if (isProParte){
308 309
								    notes = null;
309 310
								}

Also available in: Unified diff