branch develop updated (c1197fb0 -> a22b26ef)
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 c1197fb0 Fix version updates new a22b26ef Fixes #10217 - Update Biotic export 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 a22b26efac39a57792acf0aaadc255c57acb53f7 Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 17 17:43:22 2019 +0100 Fixes #10217 - Update Biotic export Summary of changes: .../service/atlantos/xml/VocabularyExport.java | 7 +++-- .../service/atlantos/xml/XmlBioticExport.java | 32 ++-------------------- 2 files changed, 7 insertions(+), 32 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 a22b26efac39a57792acf0aaadc255c57acb53f7 Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 17 17:43:22 2019 +0100 Fixes #10217 - Update Biotic export --- .../service/atlantos/xml/VocabularyExport.java | 7 +++-- .../service/atlantos/xml/XmlBioticExport.java | 32 ++-------------------- 2 files changed, 7 insertions(+), 32 deletions(-) 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 363da332..695e04ac 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 @@ -85,6 +85,7 @@ public class VocabularyExport implements EchoBaseService { // For Biotic this.vocabularyTags.put("Gear", "Gear"); this.vocabularyTags.put("AC_HaulValidity", "HaulValidity"); + this.vocabularyTags.put("AC_DepthStratum", "DepthStratum"); this.vocabularyTags.put("AC_GearExceptions", "GearExceptions"); this.vocabularyTags.put("AC_DoorType", "DoorType"); this.vocabularyTags.put("AC_CatchDataType", "DataType"); @@ -132,7 +133,7 @@ public class VocabularyExport implements EchoBaseService { this.writer.close("Vocabulary"); } - public String getVocabularyCode(String key, String defaultValue) throws IOException { + public String getVocabularyCode(String key, String defaultValue) { if (key == null || key.trim().equals("")) { this.addVocabulary(defaultValue); return defaultValue; @@ -148,12 +149,12 @@ public class VocabularyExport implements EchoBaseService { return code; } - public String getVocabularyCode(String code) throws IOException { + public String getVocabularyCode(String code) { this.addVocabulary(code); return code; } - protected void addVocabulary(String code) throws IOException { + protected void addVocabulary(String code) { Matcher matcher = this.pattern.matcher(code); matcher.find(); String prefix = matcher.group(1); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java index 27f41afa..6ff6c7e5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java @@ -400,12 +400,13 @@ public class XmlBioticExport implements EchoBaseService { (int)((operation.getGearShootingEndTime().getTime() - operation.getGearShootingStartTime().getTime()) / (1000 * 60))); xml.create("Validity", "IDREF", vocabulary.getVocabularyCode("AC_HaulValidity_V")); + xml.create("DepthStratum", + "IDREF", vocabulary.getVocabularyCode("AC_DepthStratum_" + depthStratum)); xml.create("StartLatitude", startLatitude); xml.create("StartLongitude", startLongitude); xml.create("StopLatitude", endLatitude); xml.create("StopLongitude", endLongitude); -// xml.create("StatisticalRectangle"); - xml.create("MinTrawlDepth", + xml.create("MinTrawlDepth", minTrawlDepth); xml.create("MaxTrawlDepth", maxTrawlDepth); @@ -415,33 +416,6 @@ public class XmlBioticExport implements EchoBaseService { distance); xml.create("Netopening", netopening); -// xml.create("CodendMesh"); -// xml.create("SweepLength"); -// xml.create("GearExceptions", -// "IDREF", ""); -// xml.create("DoorType", -// "IDREF", ""); -// xml.create("WarpLength"); -// xml.create("WarpDiameter"); -// xml.create("WarpDensity"); -// xml.create("DoorSurface"); -// xml.create("DoorWeight"); -// xml.create("DoorSpread"); -// xml.create("WingSpread"); -// xml.create("Buoyancy"); -// xml.create("KiteArea"); -// xml.create("GroundRopeWeight"); -// xml.create("Rigging"); -// xml.create("Tickler"); -// xml.create("HydrographicStationID"); -// xml.create("TowDirection"); -// xml.create("SpeedGround"); -// xml.create("SpeedWater"); -// xml.create("WindDirection"); -// xml.create("WindSpeed"); -// xml.create("SwellDirection"); -// xml.create("SwellHeight"); -// xml.create("LogDistance"); } public void exportCatch(Sample subsample, Float subsampledWeight, Float speciesCategoryWeight, Integer subsampledNumber, Integer speciesCategoryNumber, XmlWriter xml) throws IOException { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm