Project

General

Profile

« Previous | Next » 

Revision 4298d81b

Added by Andreas Müller over 5 years ago

fix Berlin Model Occurrence and TaxonRelation import validators

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelOccurrenceImportValidator.java
97 97
            boolean result = true;
98 98
            Source source = config.getSource();
99 99
            String strSelect = "SELECT OccurrenceId, PTNameFk, PTRefFk, AreaFk, Sources, Created_When, Created_Who, Updated_When, Updated_Who, Notes, Occurrence ";
100
            String strCount = " count(*) ";
100
            String strCount = " SELECT count(*) ";
101 101
            String strQueryBase =
102 102
                    " FROM emOccurrence " +
103 103
                    " WHERE (Sources LIKE '%  %') OR (Sources LIKE '% ') OR (Sources LIKE ' %') ";
app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelTaxonRelationImportValidator.java
316 316
	            String strSelect = " SELECT rel.RelQualifierFk, rel.RelRefFk, syn.PTRefFk,  * ";
317 317
	            String strCount = " SELECT count(*) as n ";
318 318
	            String strQueryBase =
319
	                "  SELECT rel.RelQualifierFk, rel.RelRefFk, syn.PTRefFk,  * " +
320 319
	                "  FROM RelPTaxon rel " +
321 320
	                "    INNER JOIN PTaxon syn ON rel.PTRefFk1 = syn.PTRefFk AND rel.PTNameFk1 = syn.PTNameFk " +
322 321
	                "  WHERE rel.RelRefFk IS NOT NULL AND rel.RelRefFk <> syn.PTRefFk AND rel.RelRefFk <> rel.PTRefFk2 " +

Also available in: Unified diff