This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit f64135905e33833d20fbabdc66b4b69eab79908c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Tue Jul 5 18:18:00 2016 +0200 Modify esdu cell name --- .../echobase/services/csv/CellValueParser.java | 33 +--------------------- src/site/en/rst/importData.rst | 4 +-- src/site/rst/importData.rst | 4 +-- 3 files changed, 5 insertions(+), 36 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueParser.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueParser.java index b3d5347..50ec8d1 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueParser.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueParser.java @@ -48,27 +48,7 @@ public class CellValueParser implements ValueParser<Cell> { } @Override - public Cell parse(String value) throws ParseException { - - int separatorIndex = value.indexOf("_"); - - String esduCellId; - String elementaryCellId; - - if (separatorIndex == -1) { - - // just esdu cell in value - - esduCellId = value; - elementaryCellId = null; - } else { - - // esdu and elementary cell in value - - esduCellId = value.substring(0, separatorIndex); - elementaryCellId = value.substring(separatorIndex + 1); - } - + public Cell parse(String esduCellId) throws ParseException { // get esdu cell Cell result = getEsduCell(esduCellId); @@ -76,17 +56,6 @@ public class CellValueParser implements ValueParser<Cell> { //FIXME USe a real exception throw new ImportRuntimeException("Can not found esdu cell [" + esduCellId + "]"); } - - if (elementaryCellId != null) { - - // using a elementary cell - - result = result.getChildByName(elementaryCellId); - if (result == null) { - //FIXME USe a real exception - throw new ImportRuntimeException("Can not found elementary cell [" + elementaryCellId + "] for esdu cell [" + esduCellId + "]"); - } - } return result; } diff --git a/src/site/en/rst/importData.rst b/src/site/en/rst/importData.rst index 4a6809a..54560c5 100644 --- a/src/site/en/rst/importData.rst +++ b/src/site/en/rst/importData.rst @@ -55,8 +55,8 @@ Columns format +---------------+---------------------------------------------------------------+ | (date) |ISO date format: *yyyy-MM-dd HH:mm:ss.SSSS* | +---------------+---------------------------------------------------------------+ -| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName] | -| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | +| (esdu cell) |esdu cell name: <date>_<depth> | +| | with date format yyyy-MM-dd HH:mm:ss.SSSS | +---------------+---------------------------------------------------------------+ Important diff --git a/src/site/rst/importData.rst b/src/site/rst/importData.rst index 24a7f90..cb06213 100644 --- a/src/site/rst/importData.rst +++ b/src/site/rst/importData.rst @@ -54,8 +54,8 @@ Format des colonnes +---------------+---------------------------------------------------------------+ | (date) |unique format de date : *yyyy-MM-dd HH:mm:ss.SSSS* | +---------------+---------------------------------------------------------------+ -| (esdu cell) |nom de cellule esdu elementary : esduName[_elementaryCellName] | -| | avec esdu name au format yyyy-MM-dd HH:mm:ss.SSSS | +| (esdu cell) |nom de cellule esdu : <date>_<depth> | +| | avec date au format yyyy-MM-dd HH:mm:ss.SSSS | +---------------+---------------------------------------------------------------+ Notes importantes -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.