This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit b6e640f00cd446b298da0e42c9b89a5bd9a0293d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Apr 18 08:45:01 2015 +0200 refs #6990 utilisation de la table de translation des referenceTaxonId lors de l'import du protocole --- .../tutti/persistence/entities/protocol/TuttiProtocols.java | 10 ++++------ .../genericformat/importactions/ImportProtocolAction.java | 6 ++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java index 870953b..540d59c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java @@ -151,7 +151,7 @@ public class TuttiProtocols extends AbstractTuttiProtocols { return result; } - public static void translateReferenceTaxonIds(TuttiProtocol result, Map<String, String> idTranslationMap) { + public static void translateReferenceTaxonIds(TuttiProtocol result, Map<Integer, Integer> idTranslationMap) { List<SpeciesProtocol> species = result.getSpecies(); translateReferenceTaxonIds(species, idTranslationMap); @@ -161,15 +161,13 @@ public class TuttiProtocols extends AbstractTuttiProtocols { } - protected static void translateReferenceTaxonIds(List<SpeciesProtocol> species, Map<String, String> idTranslationMap) { + protected static void translateReferenceTaxonIds(List<SpeciesProtocol> species, Map<Integer, Integer> idTranslationMap) { for (SpeciesProtocol speciesProtocol : species) { Integer speciesReferenceTaxonId = speciesProtocol.getSpeciesReferenceTaxonId(); - String id = String.valueOf(speciesReferenceTaxonId); - if (idTranslationMap.containsKey(id)) { + if (idTranslationMap.containsKey(speciesReferenceTaxonId)) { - String newId = idTranslationMap.get(id); - Integer newSpeciesReferenceTaxonId = Integer.valueOf(newId); + Integer newSpeciesReferenceTaxonId = idTranslationMap.get(speciesReferenceTaxonId); speciesProtocol.setSpeciesReferenceTaxonId(newSpeciesReferenceTaxonId); } diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportProtocolAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportProtocolAction.java index 2ff1643..8cddeb3 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportProtocolAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportProtocolAction.java @@ -90,8 +90,10 @@ public class ImportProtocolAction extends ImportActionSupport { TuttiProtocol tuttiProtocol = persistenceHelper.importProtocol(archive.getProtocolPath().toFile()); - Map<String, String> idTranslationMap = importContext.getReferentialTemporarySpeciesFileResult().getIdTranslationMap(); - TuttiProtocols.translateReferenceTaxonIds(tuttiProtocol, idTranslationMap); + // get id translations + Map<Integer, Integer> referenceTaxonIdMap = importContext.getReferentialTemporarySpeciesFileResult().getReferenceTaxonIdTranslationMap(); + + TuttiProtocols.translateReferenceTaxonIds(tuttiProtocol, referenceTaxonIdMap); String protocolOriginalName = tuttiProtocol.getName(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.