branch develop updated (d195ca5 -> 8fd8e29)
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 d195ca5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new aa9ba14 Remove useless files new 2bd5b1a #8755 Get dataQuality in right place new 8fd8e29 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop The 3 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 8fd8e29092af4b8d4313cae3aa7e6532ecd2fe71 Merge: 2bd5b1a d195ca5 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 17:30:34 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop commit 2bd5b1ab8cf4815b3b987eebdc8f69e252450e3c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 17:29:41 2016 +0100 #8755 Get dataQuality in right place commit aa9ba143c170f437e4a0366733312804ad6ffc38 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 12:38:39 2016 +0100 Remove useless files Summary of changes: .../csv/VoyageResultsRegionCellImportRow.java | 25 +++--- echobase-services/src/main/resources/actual | 99 --------------------- echobase-services/src/main/resources/expected | 99 --------------------- .../import-data/result/region/regionResults.csv.gz | Bin 13249 -> 13099 bytes .../import-data/result/region/regions.csv.gz | Bin 4440 -> 4413 bytes 5 files changed, 12 insertions(+), 211 deletions(-) delete mode 100644 echobase-services/src/main/resources/actual delete mode 100644 echobase-services/src/main/resources/expected -- 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 aa9ba143c170f437e4a0366733312804ad6ffc38 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 12:38:39 2016 +0100 Remove useless files --- echobase-services/src/main/resources/actual | 99 --------------------------- echobase-services/src/main/resources/expected | 99 --------------------------- 2 files changed, 198 deletions(-) diff --git a/echobase-services/src/main/resources/actual b/echobase-services/src/main/resources/actual deleted file mode 100644 index 55b6c90..0000000 --- a/echobase-services/src/main/resources/actual +++ /dev/null @@ -1,99 +0,0 @@ -voyage;name;echotype;lengthClass;sizeCategory;lengthCategoryMeaning;baracoudaCode;dataQuality;Biomass;Abundance -PELGAS2011;2011-04-26 13:35:19.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;5190.7652880528;1297691.3220132 -PELGAS2011;2011-04-26 13:35:19.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;6488.456610066;1297691.3220132 -PELGAS2011;2011-04-26 13:35:19.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;4.23216018464326;192.370917483784 -PELGAS2011;2011-04-26 13:35:19.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;518.378413690509;38398.4010141118 -PELGAS2011;2011-04-26 13:35:19.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;205.705719718456;16456.4575774765 -PELGAS2011;2011-04-26 13:35:19.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;56.6833538779745;3656.99057277255 -PELGAS2011;2011-04-26 13:35:19.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;76.7968020282235;6399.73350235196 -PELGAS2011;2011-04-26 13:35:19.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;219.419434366353;14627.9622910902 -PELGAS2011;2011-04-26 13:35:19.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;550.377081202269;39312.6486573049 -PELGAS2011;2011-04-26 13:35:19.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;424.210906441616;29255.9245821804 -PELGAS2011;2011-04-26 13:35:19.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;427.867897014388;32912.9151549529 -PELGAS2011;2011-04-26 13:41:22.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;206.748808467523;14767.7720333945 -PELGAS2011;2011-04-26 13:41:22.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;644.288634652546;128857.726930509 -PELGAS2011;2011-04-26 13:41:22.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;194.728528905458;14424.3354744784 -PELGAS2011;2011-04-26 13:41:22.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;82.4247741398764;5494.98494265843 -PELGAS2011;2011-04-26 13:41:22.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;28.8486709489567;2404.05591241306 -PELGAS2011;2011-04-26 13:41:22.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;21.2930666528014;1373.74623566461 -PELGAS2011;2011-04-26 13:41:22.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;160.728309572759;12363.7161209815 -PELGAS2011;2011-04-26 13:41:22.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;515.430907722037;128857.726930509 -PELGAS2011;2011-04-26 13:41:22.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;1.58980834286797;72.2640155849076 -PELGAS2011;2011-04-26 13:41:22.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;159.354563337094;10989.9698853169 -PELGAS2011;2011-04-26 13:41:22.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;77.2732257561342;6181.85806049073 -PELGAS2011;2011-04-26 13:47:25.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;77.909187521494;19477.2968803735 -PELGAS2011;2011-04-26 13:47:25.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;6.60413453599069;300.187933454122 -PELGAS2011;2011-04-26 13:47:25.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;88.4523455231334;5706.60293697635 -PELGAS2011;2011-04-26 13:47:25.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;119.838661676503;9986.55513970861 -PELGAS2011;2011-04-26 13:47:25.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;858.84374201494;61345.9815724957 -PELGAS2011;2011-04-26 13:47:25.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;342.396176218581;22826.4117479054 -PELGAS2011;2011-04-26 13:47:25.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;97.3864844018675;19477.2968803735 -PELGAS2011;2011-04-26 13:47:25.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;808.910966316397;59919.3308382517 -PELGAS2011;2011-04-26 13:47:25.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;661.965940689256;45652.8234958108 -PELGAS2011;2011-04-26 13:47:25.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;667.672543626233;51359.4264327871 -PELGAS2011;2011-04-26 13:47:25.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;320.99641520492;25679.7132163936 -PELGAS2011;2011-04-26 13:53:27.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;640.663719422669;51253.0975538135 -PELGAS2011;2011-04-26 13:53:27.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;1614.47257294513;119590.560958898 -PELGAS2011;2011-04-26 13:53:27.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;683.374634050847;45558.3089367232 -PELGAS2011;2011-04-26 13:53:27.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;176.538447129802;11389.5772341808 -PELGAS2011;2011-04-26 13:53:27.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;239.181121917797;19931.7601598164 -PELGAS2011;2011-04-26 13:53:27.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;1714.13137374421;122437.955267443 -PELGAS2011;2011-04-26 13:53:27.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;1321.19095916497;91116.6178734463 -PELGAS2011;2011-04-26 13:53:27.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;1332.58053639915;102506.195107627 -PELGAS2011;2011-04-26 13:53:27.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;13.180924131799;599.132915081774 -PELGAS2011;2011-04-26 13:59:40.0000;;4.0;4.0;mid point of 1 cm size bin;MICR-POU;;1799.46233766808;449865.58441702 -PELGAS2011;2011-04-26 13:59:40.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;49.0514771403708;2229.61259728958 -PELGAS2011;2011-04-26 13:59:40.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;656.969990661963;42385.1606878686 -PELGAS2011;2011-04-26 13:59:40.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;6378.96668352423;455640.477394588 -PELGAS2011;2011-04-26 13:59:40.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;4959.06380048063;381466.446190817 -PELGAS2011;2011-04-26 13:59:40.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;2543.10964127212;169540.642751474 -PELGAS2011;2011-04-26 13:59:40.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;2384.16528869261;190733.223095409 -PELGAS2011;2011-04-26 13:59:40.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;890.088374445241;74174.0312037701 -PELGAS2011;2011-04-26 13:59:40.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;6008.09652750537;445044.18722262 -PELGAS2011;2011-04-26 13:59:40.0000;;5.0;5.0;mid point of 1 cm size bin;MICR-POU;;2249.3279220851;449865.58441702 -PELGAS2011;2011-04-26 13:59:40.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;4916.67863979276;339081.285502949 -PELGAS2011;2011-04-26 15:39:10.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;611.371199289744;40758.0799526496 -PELGAS2011;2011-04-26 15:39:10.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;11.7921224942708;536.005567921401 -PELGAS2011;2011-04-26 15:39:10.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;157.937559816517;10189.5199881624 -PELGAS2011;2011-04-26 15:39:10.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;573.160499334135;45852.8399467308 -PELGAS2011;2011-04-26 15:39:10.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;1444.36445832202;106989.959875705 -PELGAS2011;2011-04-26 15:39:10.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;213.97991975141;17831.6599792842 -PELGAS2011;2011-04-26 15:39:10.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;1192.173838615;91705.6798934616 -PELGAS2011;2011-04-26 15:39:10.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;1533.52275821844;109537.339872746 -PELGAS2011;2011-04-26 15:39:10.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;1181.98431862684;81516.1599052992 -PELGAS2011;2011-04-26 15:45:19.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;355.624947719365;28449.9958175492 -PELGAS2011;2011-04-26 15:45:19.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;132.766647148563;11063.8872623802 -PELGAS2011;2011-04-26 15:45:19.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;379.333277567323;25288.8851711549 -PELGAS2011;2011-04-26 15:45:19.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;7.31657703278099;332.571683308227 -PELGAS2011;2011-04-26 15:45:19.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;739.69989125628;56899.9916350984 -PELGAS2011;2011-04-26 15:45:19.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;951.494304564702;67963.8788974787 -PELGAS2011;2011-04-26 15:45:19.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;97.9944300382251;6322.22129278871 -PELGAS2011;2011-04-26 15:45:19.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;733.377669963491;50577.7703423097 -PELGAS2011;2011-04-26 15:45:19.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;896.1748682528;66383.3235742815 -PELGAS2011;2011-04-26 15:51:29.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;635.249201582806;42349.9467721871 -PELGAS2011;2011-04-26 15:51:29.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;222.337220553982;18528.1017128319 -PELGAS2011;2011-04-26 15:51:29.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;1228.14845639343;84699.8935443742 -PELGAS2011;2011-04-26 15:51:29.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;1500.77623873938;111168.610276991 -PELGAS2011;2011-04-26 15:51:29.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;1238.73594308647;95287.380237421 -PELGAS2011;2011-04-26 15:51:29.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;164.106043742225;10587.4866930468 -PELGAS2011;2011-04-26 15:51:29.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;595.546126483881;47643.6901187105 -PELGAS2011;2011-04-26 15:51:29.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;1593.41674730354;113815.481950253 -PELGAS2011;2011-04-26 15:51:29.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;12.2526811994983;556.940054522652 -PELGAS2011;2011-04-26 19:00:33.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;259.421646546826;18530.1176104876 -PELGAS2011;2011-04-26 19:00:33.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;199.952897006192;13789.8549659442 -PELGAS2011;2011-04-26 19:00:33.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;103.423912244582;6894.92748297212 -PELGAS2011;2011-04-26 19:00:33.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;201.676628876935;15513.5868366873 -PELGAS2011;2011-04-26 19:00:33.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;244.338992677825;18099.1846428018 -PELGAS2011;2011-04-26 19:00:33.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;26.717843996517;1723.73187074303 -PELGAS2011;2011-04-26 19:00:33.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;1.99483954010538;90.6745245502444 -PELGAS2011;2011-04-26 19:00:33.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;36.1983692856036;3016.5307738003 -PELGAS2011;2011-04-26 19:00:33.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;96.9599177292955;7756.79341834364 -PELGAS2011;2011-04-26 19:06:46.0000;;22.0;22.0;mid point of 1 cm size bin;SCOM-SCO;;7.48371897748001;340.16904443091 -PELGAS2011;2011-04-26 19:06:46.0000;;12.0;12.0;mid point of 1 cm size bin;ENGR-ENC;;135.799605797964;11316.633816497 -PELGAS2011;2011-04-26 19:06:46.0000;;12.5;12.5;mid point of 1 cm size bin;ENGR-ENC;;363.748944101689;29099.9155281351 -PELGAS2011;2011-04-26 19:06:46.0000;;15.5;15.5;mid point of 1 cm size bin;ENGR-ENC;;100.233042374688;6466.64789514113 -PELGAS2011;2011-04-26 19:06:46.0000;;14.0;14.0;mid point of 1 cm size bin;ENGR-ENC;;973.230508218741;69516.4648727672 -PELGAS2011;2011-04-26 19:06:46.0000;;13.5;13.5;mid point of 1 cm size bin;ENGR-ENC;;916.647339136255;67899.8028989819 -PELGAS2011;2011-04-26 19:06:46.0000;;13.0;13.0;mid point of 1 cm size bin;ENGR-ENC;;756.597803731512;58199.8310562702 -PELGAS2011;2011-04-26 19:06:46.0000;;14.5;14.5;mid point of 1 cm size bin;ENGR-ENC;;750.131155836371;51733.1831611291 -PELGAS2011;2011-04-26 19:06:46.0000;;15.0;15.0;mid point of 1 cm size bin;ENGR-ENC;;387.998873708468;25866.5915805645 diff --git a/echobase-services/src/main/resources/expected b/echobase-services/src/main/resources/expected deleted file mode 100644 index aeb4950..0000000 --- a/echobase-services/src/main/resources/expected +++ /dev/null @@ -1,99 +0,0 @@ -voyage;name;echotype;lengthClass;sizeCategory;lengthCategoryMeaning;baracoudaCode;dataQuality;Biomass;Abundance -PELGAS2011;2011-04-26 13:35:19.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;5190.7652880528;1297691.3220132 -PELGAS2011;2011-04-26 13:35:19.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;6488.456610066;1297691.3220132 -PELGAS2011;2011-04-26 13:35:19.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;4.23216018464326;192.370917483784 -PELGAS2011;2011-04-26 13:35:19.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;518.378413690509;38398.4010141118 -PELGAS2011;2011-04-26 13:35:19.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;205.705719718456;16456.4575774765 -PELGAS2011;2011-04-26 13:35:19.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;56.6833538779745;3656.99057277255 -PELGAS2011;2011-04-26 13:35:19.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;76.7968020282235;6399.73350235196 -PELGAS2011;2011-04-26 13:35:19.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;219.419434366353;14627.9622910902 -PELGAS2011;2011-04-26 13:35:19.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;550.377081202269;39312.6486573049 -PELGAS2011;2011-04-26 13:35:19.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;424.210906441616;29255.9245821804 -PELGAS2011;2011-04-26 13:35:19.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;427.867897014388;32912.9151549529 -PELGAS2011;2011-04-26 13:41:22.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;206.748808467523;14767.7720333945 -PELGAS2011;2011-04-26 13:41:22.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;644.288634652546;128857.726930509 -PELGAS2011;2011-04-26 13:41:22.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;194.728528905458;14424.3354744784 -PELGAS2011;2011-04-26 13:41:22.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;82.4247741398764;5494.98494265843 -PELGAS2011;2011-04-26 13:41:22.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;28.8486709489567;2404.05591241306 -PELGAS2011;2011-04-26 13:41:22.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;21.2930666528014;1373.74623566461 -PELGAS2011;2011-04-26 13:41:22.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;160.728309572759;12363.7161209815 -PELGAS2011;2011-04-26 13:41:22.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;515.430907722037;128857.726930509 -PELGAS2011;2011-04-26 13:41:22.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;1.58980834286797;72.2640155849076 -PELGAS2011;2011-04-26 13:41:22.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;159.354563337094;10989.9698853169 -PELGAS2011;2011-04-26 13:41:22.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;77.2732257561342;6181.85806049073 -PELGAS2011;2011-04-26 13:47:25.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;77.909187521494;19477.2968803735 -PELGAS2011;2011-04-26 13:47:25.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;6.60413453599069;300.187933454122 -PELGAS2011;2011-04-26 13:47:25.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;88.4523455231334;5706.60293697635 -PELGAS2011;2011-04-26 13:47:25.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;119.838661676503;9986.55513970861 -PELGAS2011;2011-04-26 13:47:25.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;858.84374201494;61345.9815724957 -PELGAS2011;2011-04-26 13:47:25.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;342.396176218581;22826.4117479054 -PELGAS2011;2011-04-26 13:47:25.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;97.3864844018675;19477.2968803735 -PELGAS2011;2011-04-26 13:47:25.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;808.910966316397;59919.3308382517 -PELGAS2011;2011-04-26 13:47:25.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;661.965940689256;45652.8234958108 -PELGAS2011;2011-04-26 13:47:25.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;667.672543626233;51359.4264327871 -PELGAS2011;2011-04-26 13:47:25.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;320.99641520492;25679.7132163936 -PELGAS2011;2011-04-26 13:53:27.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;640.663719422669;51253.0975538135 -PELGAS2011;2011-04-26 13:53:27.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;1614.47257294513;119590.560958898 -PELGAS2011;2011-04-26 13:53:27.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;683.374634050847;45558.3089367232 -PELGAS2011;2011-04-26 13:53:27.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;176.538447129802;11389.5772341808 -PELGAS2011;2011-04-26 13:53:27.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;239.181121917797;19931.7601598164 -PELGAS2011;2011-04-26 13:53:27.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;1714.13137374421;122437.955267443 -PELGAS2011;2011-04-26 13:53:27.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;1321.19095916497;91116.6178734463 -PELGAS2011;2011-04-26 13:53:27.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;1332.58053639915;102506.195107627 -PELGAS2011;2011-04-26 13:53:27.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;13.180924131799;599.132915081774 -PELGAS2011;2011-04-26 13:59:40.0000;;4.0;0;mid point of 1 cm size bin;MICR-POU;;1799.46233766808;449865.58441702 -PELGAS2011;2011-04-26 13:59:40.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;49.0514771403708;2229.61259728958 -PELGAS2011;2011-04-26 13:59:40.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;656.969990661963;42385.1606878686 -PELGAS2011;2011-04-26 13:59:40.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;6378.96668352423;455640.477394588 -PELGAS2011;2011-04-26 13:59:40.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;4959.06380048063;381466.446190817 -PELGAS2011;2011-04-26 13:59:40.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;2543.10964127212;169540.642751474 -PELGAS2011;2011-04-26 13:59:40.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;2384.16528869261;190733.223095409 -PELGAS2011;2011-04-26 13:59:40.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;890.088374445241;74174.0312037701 -PELGAS2011;2011-04-26 13:59:40.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;6008.09652750537;445044.18722262 -PELGAS2011;2011-04-26 13:59:40.0000;;5.0;0;mid point of 1 cm size bin;MICR-POU;;2249.3279220851;449865.58441702 -PELGAS2011;2011-04-26 13:59:40.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;4916.67863979276;339081.285502949 -PELGAS2011;2011-04-26 15:39:10.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;611.371199289744;40758.0799526496 -PELGAS2011;2011-04-26 15:39:10.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;11.7921224942708;536.005567921401 -PELGAS2011;2011-04-26 15:39:10.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;157.937559816517;10189.5199881624 -PELGAS2011;2011-04-26 15:39:10.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;573.160499334135;45852.8399467308 -PELGAS2011;2011-04-26 15:39:10.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;1444.36445832202;106989.959875705 -PELGAS2011;2011-04-26 15:39:10.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;213.97991975141;17831.6599792842 -PELGAS2011;2011-04-26 15:39:10.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;1192.173838615;91705.6798934616 -PELGAS2011;2011-04-26 15:39:10.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;1533.52275821844;109537.339872746 -PELGAS2011;2011-04-26 15:39:10.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;1181.98431862684;81516.1599052992 -PELGAS2011;2011-04-26 15:45:19.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;355.624947719365;28449.9958175492 -PELGAS2011;2011-04-26 15:45:19.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;132.766647148563;11063.8872623802 -PELGAS2011;2011-04-26 15:45:19.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;379.333277567323;25288.8851711549 -PELGAS2011;2011-04-26 15:45:19.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;7.31657703278099;332.571683308227 -PELGAS2011;2011-04-26 15:45:19.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;739.69989125628;56899.9916350984 -PELGAS2011;2011-04-26 15:45:19.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;951.494304564702;67963.8788974787 -PELGAS2011;2011-04-26 15:45:19.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;97.9944300382251;6322.22129278871 -PELGAS2011;2011-04-26 15:45:19.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;733.377669963491;50577.7703423097 -PELGAS2011;2011-04-26 15:45:19.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;896.1748682528;66383.3235742815 -PELGAS2011;2011-04-26 15:51:29.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;635.249201582806;42349.9467721871 -PELGAS2011;2011-04-26 15:51:29.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;222.337220553982;18528.1017128319 -PELGAS2011;2011-04-26 15:51:29.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;1228.14845639343;84699.8935443742 -PELGAS2011;2011-04-26 15:51:29.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;1500.77623873938;111168.610276991 -PELGAS2011;2011-04-26 15:51:29.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;1238.73594308647;95287.380237421 -PELGAS2011;2011-04-26 15:51:29.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;164.106043742225;10587.4866930468 -PELGAS2011;2011-04-26 15:51:29.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;595.546126483881;47643.6901187105 -PELGAS2011;2011-04-26 15:51:29.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;1593.41674730354;113815.481950253 -PELGAS2011;2011-04-26 15:51:29.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;12.2526811994983;556.940054522652 -PELGAS2011;2011-04-26 19:00:33.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;259.421646546826;18530.1176104876 -PELGAS2011;2011-04-26 19:00:33.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;199.952897006192;13789.8549659442 -PELGAS2011;2011-04-26 19:00:33.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;103.423912244582;6894.92748297212 -PELGAS2011;2011-04-26 19:00:33.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;201.676628876935;15513.5868366873 -PELGAS2011;2011-04-26 19:00:33.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;244.338992677825;18099.1846428018 -PELGAS2011;2011-04-26 19:00:33.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;26.717843996517;1723.73187074303 -PELGAS2011;2011-04-26 19:00:33.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;1.99483954010538;90.6745245502444 -PELGAS2011;2011-04-26 19:00:33.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;36.1983692856036;3016.5307738003 -PELGAS2011;2011-04-26 19:00:33.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;96.9599177292955;7756.79341834364 -PELGAS2011;2011-04-26 19:06:46.0000;;22.0;0;mid point of 1 cm size bin;SCOM-SCO;;7.48371897748001;340.16904443091 -PELGAS2011;2011-04-26 19:06:46.0000;;12.0;0;mid point of 1 cm size bin;ENGR-ENC;;135.799605797964;11316.633816497 -PELGAS2011;2011-04-26 19:06:46.0000;;12.5;0;mid point of 1 cm size bin;ENGR-ENC;;363.748944101689;29099.9155281351 -PELGAS2011;2011-04-26 19:06:46.0000;;15.5;0;mid point of 1 cm size bin;ENGR-ENC;;100.233042374688;6466.64789514113 -PELGAS2011;2011-04-26 19:06:46.0000;;14.0;0;mid point of 1 cm size bin;ENGR-ENC;;973.230508218741;69516.4648727672 -PELGAS2011;2011-04-26 19:06:46.0000;;13.5;0;mid point of 1 cm size bin;ENGR-ENC;;916.647339136255;67899.8028989819 -PELGAS2011;2011-04-26 19:06:46.0000;;13.0;0;mid point of 1 cm size bin;ENGR-ENC;;756.597803731512;58199.8310562702 -PELGAS2011;2011-04-26 19:06:46.0000;;14.5;0;mid point of 1 cm size bin;ENGR-ENC;;750.131155836371;51733.1831611291 -PELGAS2011;2011-04-26 19:06:46.0000;;15.0;0;mid point of 1 cm size bin;ENGR-ENC;;387.998873708468;25866.5915805645 -- 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 2bd5b1ab8cf4815b3b987eebdc8f69e252450e3c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 17:29:41 2016 +0100 #8755 Get dataQuality in right place --- .../csv/VoyageResultsRegionCellImportRow.java | 25 ++++++++++----------- .../import-data/result/region/regionResults.csv.gz | Bin 13249 -> 13099 bytes .../import-data/result/region/regions.csv.gz | Bin 4440 -> 4413 bytes 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java index 05fc438..4984dc3 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportRow.java @@ -58,6 +58,18 @@ public class VoyageResultsRegionCellImportRow { protected float dataSurface; + public static VoyageResultsRegionCellImportRow of(Voyage voyage, Data coordinateData, float surfaceDataValue) { + VoyageResultsRegionCellImportRow row = new VoyageResultsRegionCellImportRow(); + row.setVoyage(voyage); + Cell cell = coordinateData.getCell(); + row.setName(cell.getName()); + row.setCellType(cell.getCellType()); + row.setDataSurface(surfaceDataValue); + row.setDataCoordinate(coordinateData.getDataValue()); + row.setDataQuality(cell.getDataQuality()); + return row; + } + public VoyageResultsRegionCellImportRow() { } @@ -108,17 +120,4 @@ public class VoyageResultsRegionCellImportRow { public void setDataQuality(DataQuality dataQuality) { this.dataQuality = dataQuality; } - - public static VoyageResultsRegionCellImportRow of(Voyage voyage, Data coordinateData, float surfaceDataValue) { - VoyageResultsRegionCellImportRow row = new VoyageResultsRegionCellImportRow(); - row.setVoyage(voyage); - Cell cell = coordinateData.getCell(); - row.setName(cell.getName()); - row.setCellType(cell.getCellType()); - row.setDataSurface(surfaceDataValue); - row.setDataCoordinate(coordinateData.getDataValue()); - row.setDataQuality(coordinateData.getDataQuality()); - return row; - } - } diff --git a/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz b/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz index c8da4eb..b8bc5b9 100644 Binary files a/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz and b/echobase-services/src/test/resources/import-data/result/region/regionResults.csv.gz differ diff --git a/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz b/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz index 0d90277..5757532 100644 Binary files a/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz and b/echobase-services/src/test/resources/import-data/result/region/regions.csv.gz differ -- 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 8fd8e29092af4b8d4313cae3aa7e6532ecd2fe71 Merge: 2bd5b1a d195ca5 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Nov 8 17:30:34 2016 +0100 Merge branch 'develop' of gitlab.nuiton.org:codelutin/echobase into develop echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm