branch develop updated (ef5deef -> 7ce55d5)
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 ef5deef Fix unique sample new 7ce55d5 Fix error in vocabulary 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 7ce55d552d11e56b77cbae57fc3bb46199f7dac5 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 21 17:28:45 2016 +0100 Fix error in vocabulary Summary of changes: .../resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql | 1 + .../resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql | 1 + .../echobase/services/service/atlantos/xml/VocabularyExport.java | 2 +- .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- 4 files changed, 4 insertions(+), 2 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 7ce55d552d11e56b77cbae57fc3bb46199f7dac5 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Nov 21 17:28:45 2016 +0100 Fix error in vocabulary --- .../resources/migration/workingDb/h2/3.912-0-atlantos-operation.sql | 1 + .../resources/migration/workingDb/pg/3.912-0-atlantos-operation.sql | 1 + .../echobase/services/service/atlantos/xml/VocabularyExport.java | 2 +- .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- 4 files changed, 4 insertions(+), 2 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 6041b96..ba5b5a9 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,3 +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'; 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 f724762..98d4bc7 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,3 +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'; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java index 2d398a2..72a23fe 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java @@ -50,7 +50,7 @@ public class VocabularyExport implements EchoBaseService { protected Pattern pattern; public void init(XmlWriter writer) throws IOException { - this.pattern = Pattern.compile("^(((AC_)|(ISO_)|(ICES_))?[^_]+)_(\\w+)"); + this.pattern = Pattern.compile("^(((AC_)|(ISO_)|(ICES_))?[^_]+)_(.+)"); this.writer = writer; 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 5379027..1b5b41b 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_SS")); + "IDREF", vocabulary.getVocabularyCode(calibration.getAquisitionMethod(), "AC_AcquisitionMethod_ER60")); 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