Project

General

Profile

« Previous | Next » 

Revision 2a2eb365

Added by Andreas Müller over 4 years ago

ref #1444 replace tu_acctaxon by tu_accfinal

View differences:

cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/erms/validation/ErmsTaxonImportValidator.java
48 48 
                      " parentAcc.tu_status AS Expr1 " +
49 49 
                " FROM status AS parentAccStatus INNER JOIN " +
50 50 
                      " tu AS parentAcc ON parentAccStatus.status_id = parentAcc.tu_status RIGHT OUTER JOIN " +
51 
                      " tu AS parent ON parentAcc.id = parent.tu_acctaxon RIGHT OUTER JOIN " +
51 
                      " tu AS parent ON parentAcc.id = parent.tu_accfinal RIGHT OUTER JOIN " +
52 52 
                      " tu AS myTaxon ON parent.id = myTaxon.tu_parent LEFT OUTER JOIN " +
53 53 
                      " status AS parentStatus ON parent.tu_status = parentStatus.status_id LEFT OUTER JOIN " +
54 54 
                      " status AS childStatus ON myTaxon.tu_status = childStatus.status_id " +
......
61 61 
				i++;
62 62 
				if (firstRow){
63 63 
					System.out.println("========================================================");
64 
					logger.warn("There are accepted taxa that have an unaccepted parent and also the parents accepted taxon (tu_acctaxon) is not accepted. ");
64 
					logger.warn("There are accepted taxa that have an unaccepted parent and also the parents accepted taxon (tu_accfinal) is not accepted. ");
65 65 
					System.out.println("========================================================");
66 66 
				}
67 67 
				int childId = rs.getInt("childId");
......
100 100 
				" SELECT    myTaxon.id AS synonymId, myTaxon.tu_displayname AS synonymName, synonymStatus.status_name AS synonymStatus, " +
101 101 
					" accTaxon.id AS acceptedId, accTaxon.tu_displayname AS acceptedName, acceptedStatus.status_name AS acceptedStatus " +
102 102 
				" FROM tu AS myTaxon INNER JOIN " +
103 
                    " tu AS accTaxon ON myTaxon.tu_acctaxon = accTaxon.id INNER JOIN " +
103 
                    " tu AS accTaxon ON myTaxon.tu_accfinal = accTaxon.id INNER JOIN " +
104 104 
                    " status AS synonymStatus ON myTaxon.tu_status = synonymStatus.status_id INNER JOIN " +
105 105 
                    " status AS acceptedStatus ON accTaxon.tu_status = acceptedStatus.status_id " +
106 106 
                " WHERE (myTaxon.tu_status <> 1) AND (accTaxon.tu_status <> 1) " +

Also available in: Unified diff