Project

General

Profile

« Previous | Next » 

Revision 09539dc4

Added by Andreas Müller over 5 years ago

fix #7316 final fix for name relations import

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java
82 82
		String result = super.getIdQuery(state);
83 83
	    if (isNotBlank(nameIdTable)){
84 84
			if (state.getConfig().isEuroMed()){
85
			    result += " WHERE nameFk1 IN (SELECT NameId FROM %s) AND RelNameQualifierFk NOT IN (1, 3, 9, 10, 16, 6, 61) OR ";
86
			    result += "       nameFk2 IN (SELECT NameId FROM %s) AND RelNameQualifierFk NOT IN (2) ";
85
			    result += " WHERE nameFk1 IN (SELECT NameId FROM %s) AND RelNameQualifierFk IN (2, 4, 5, 13, 14, 15, 17, 18, 37, 62) OR ";
86
			    result += "       nameFk2 IN (SELECT NameId FROM %s)  ";
87
			    //the first part is only to check if there are relations that we have maybe missed.
87 88
			    //2 is unclear, 17 should be in both, 62 links names to itself
88 89
			    result = String.format(result, nameIdTable, nameIdTable);
89 90
			}else{

Also available in: Unified diff