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 5492b284a8dff69a74bc0e9d2c3421d876763888 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Jan 5 16:42:58 2016 +0100 Lors du chargement d'un protocol, on remplace les taxon referents obsoletes --- .../main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java | 4 ++++ .../ifremer/tutti/persistence/entities/protocol/TuttiProtocols.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java index 8951e86..cdb649b 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/TuttiPersistenceImpl.java @@ -997,6 +997,10 @@ public class TuttiPersistenceImpl implements TuttiPersistence { public TuttiProtocol getProtocol(String id) { TuttiProtocol protocol = getProtocolService().getProtocol(id); + // translate obsolete referent taxons (See https://forge.codelutin.com/issues/7846) + Map<Integer, Integer> allObsoleteReferentTaxons = getAllObsoleteReferentTaxons(); + TuttiProtocols.translateReferenceTaxonIds(protocol, allObsoleteReferentTaxons); + // sanity it (remove all bad species and benthos) // see http://forge.codelutin.com/issues/4154 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 540d59c..42145e0 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 @@ -170,6 +170,10 @@ public class TuttiProtocols extends AbstractTuttiProtocols { Integer newSpeciesReferenceTaxonId = idTranslationMap.get(speciesReferenceTaxonId); speciesProtocol.setSpeciesReferenceTaxonId(newSpeciesReferenceTaxonId); + if (log.isInfoEnabled()) { + log.info("Translate reference taxon from " + speciesReferenceTaxonId + " to " + newSpeciesReferenceTaxonId); + } + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.