From 47e0860cc9596900d5743bf17b482857c6143156 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 13 Jul 2012 06:15:02 +0000 Subject: [PATCH] remove deletes from PESI export --- .../cdm/io/pesi/out/PesiRelTaxonExport.java | 12 ++++++++---- .../etaxonomy/cdm/io/pesi/out/PesiSourceExport.java | 4 ++-- .../etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiRelTaxonExport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiRelTaxonExport.java index e741f52a..474fc725 100644 --- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiRelTaxonExport.java +++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiRelTaxonExport.java @@ -99,8 +99,8 @@ public class PesiRelTaxonExport extends PesiExportBase { boolean success = true; // PESI: Clear the database table RelTaxon. - doDelete(state); - + //doDelete(state); -> done by stored procedure + // Get specific mappings: (CDM) Relationship -> (PESI) RelTaxon mapping = getMapping(); @@ -113,6 +113,10 @@ public class PesiRelTaxonExport extends PesiExportBase { // Export name relations success &= doPhase02(state, mapping); + + if (! success){ + state.setUnsuccessfull(); + } } catch (SQLException e) { e.printStackTrace(); @@ -511,7 +515,7 @@ public class PesiRelTaxonExport extends PesiExportBase { * @param state * @param sr */ - private static void invokeSynonyms(PesiExportState state, TaxonNameBase synonymTaxonName) { + private void invokeSynonyms(PesiExportState state, TaxonNameBase synonymTaxonName) { // Store KingdomFk and Rank information in Taxon table Integer kingdomFk = PesiTransformer.nomenClaturalCode2Kingdom(synonymTaxonName.getNomenclaturalCode()); Integer synonymFk = state.getDbId(synonymTaxonName); @@ -528,7 +532,7 @@ public class PesiRelTaxonExport extends PesiExportBase { * @param synonymParentTaxonFk * @param currentTaxonFk */ - private static boolean saveSynonymData(PesiExportState state, TaxonNameBase taxonName, + private boolean saveSynonymData(PesiExportState state, TaxonNameBase taxonName, NomenclaturalCode nomenclaturalCode, Integer kingdomFk, Integer currentSynonymFk) { try { diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiSourceExport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiSourceExport.java index a60969de..b9496b84 100644 --- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiSourceExport.java +++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiSourceExport.java @@ -113,8 +113,8 @@ public class PesiSourceExport extends PesiExportBase { boolean success = true ; // PESI: Clear the database table Source. - doDelete(state); - + //doDelete(state); -> done by stored procedure + // Get specific mappings: (CDM) Reference -> (PESI) Source PesiExportMapping mapping = getMapping(); diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java index 7260e012..95021ebd 100644 --- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java +++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java @@ -189,7 +189,7 @@ public class PesiTaxonExport extends PesiExportBase { boolean success = true; // PESI: Clear the database table Taxon. - doDelete(state); +// doDelete(state); // Get specific mappings: (CDM) Taxon -> (PESI) Taxon PesiExportMapping mapping = getMapping(); -- 2.34.1