Project

General

Profile

« Previous | Next » 

Revision 50818ab7

Added by Katja Luther over 8 years ago

adapt the import classes to the new return type ImportResult

View differences:

app-import/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java
249 249
				int relPTaxonId = rs.getInt("RelPTaxonId");
250 250
				Integer taxon1Id = nullSafeInt(rs, "taxon1Id");
251 251
				Integer taxon2Id = nullSafeInt(rs, "taxon2Id");
252
				int relQualifierFk = 0;
252 253
				try {
253 254
					Integer relRefFk = nullSafeInt(rs,"relRefFk");
254 255
					int treeRefFk = rs.getInt("treeRefFk");
255 256
					int fromRefFk = rs.getInt("fromRefFk");
256 257

  
257
					int relQualifierFk = rs.getInt("relQualifierFk");
258
					relQualifierFk = rs.getInt("relQualifierFk");
258 259
					String notes = rs.getString("notes");
259 260
					boolean isConceptRelationship = rs.getBoolean("is_concept_relation");
260 261

  
......
366 367
						success = false;
367 368
					}
368 369
				} catch (Exception e) {
369
					logger.error("Exception occurred when trying to handle taxon relationship " + relPTaxonId + " (" + taxon1Id + ","+ taxon2Id + "): " + e.getMessage());
370
					logger.error("Exception occurred when trying to handle taxon relationship " + relPTaxonId + " relQualifierFK " + relQualifierFk + " (" + taxon1Id + ","+ taxon2Id + "): " + e.getMessage());
370 371
					e.printStackTrace();
371 372
				}
372 373
			}
......
621 622
		Classification tree = classificationMap.get(treeRefFk);
622 623
		if (tree == null){
623 624
			UUID treeUuid = state.getTreeUuidByIntTreeKey(treeRefFk);
625
			if (treeUuid == null){
626
				throw new IllegalStateException("treeUUID does not exist in state for " + treeRefFk );
627
			}
624 628
			tree = getClassificationService().find(treeUuid);
625 629
			classificationMap.put(treeRefFk, tree);
626 630
		}

Also available in: Unified diff