branch develop updated (15e0c62 -> cff9512)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 15e0c62 Fix NPE during test new cff9512 Change the default value The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cff9512494b2fb3e8a0f8e47a697188b8e62962c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 22 11:26:20 2016 +0100 Change the default value Summary of changes: .../resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql | 2 +- .../resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql | 2 +- .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit cff9512494b2fb3e8a0f8e47a697188b8e62962c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 22 11:26:20 2016 +0100 Change the default value --- .../resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql | 2 +- .../resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql | 2 +- .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/echobase-domain/src/main/resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql b/echobase-domain/src/main/resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql index ba5b5a9..6aa95da 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql @@ -45,4 +45,4 @@ insert into vocabularyciem (topiaId, topiaVersion, topiaCreateDate, label, code) update vocabularyciem SET code = 'Gear_PMT_57x52' WHERE label = '57x52'; update vocabularyciem SET code = 'Gear_PMT_76x70' WHERE label = '76x70'; -update vocabularyciem SET code = 'AC_AcquisitionMethod_ER60' WHERE label = 'ER60'; +update vocabularyciem SET code = 'AC_AcquisitionMethod_SS' WHERE label = 'ER60'; diff --git a/echobase-domain/src/main/resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql b/echobase-domain/src/main/resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql index 98d4bc7..481608b 100644 --- a/echobase-domain/src/main/resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql +++ b/echobase-domain/src/main/resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql @@ -45,4 +45,4 @@ insert into vocabularyciem (topiaId, topiaVersion, topiaCreateDate, label, code) update vocabularyciem SET code = 'Gear_PMT_57x52' WHERE label = '57x52'; update vocabularyciem SET code = 'Gear_PMT_76x70' WHERE label = '76x70'; -update vocabularyciem SET code = 'AC_AcquisitionMethod_ER60' WHERE label = 'ER60'; +update vocabularyciem SET code = 'AC_AcquisitionMethod_SS' WHERE label = 'ER60'; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java index c3f7ea8..5060fd6 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java @@ -242,7 +242,7 @@ public class XmlAccousticExport implements EchoBaseService { xml.create("Date", EchoBaseCsvUtil.ISO8611_DATE_FORMATTER.format(calibration.getDate())); xml.create("AcquisitionMethod", - "IDREF", vocabulary.getVocabularyCode(calibration.getAquisitionMethod(), "AC_AcquisitionMethod_ER60")); + "IDREF", vocabulary.getVocabularyCode(calibration.getAquisitionMethod(), "AC_AcquisitionMethod_SS")); xml.create("ProcessingMethod", "IDREF", vocabulary.getVocabularyCode("Method_" + calibration.getProcessingMethod(), "AC_ProcessingMethod_ER60")); xml.create("AccuracyEstimate", -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm