Author: tchemit Date: 2012-03-28 19:49:29 +0200 (Wed, 28 Mar 2012) New Revision: 431 Url: http://forge.codelutin.com/repositories/revision/echobase/431 Log: add useFillValue in ResultValueParser Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-28 17:44:08 UTC (rev 430) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/EchobaseCsvUtil.java 2012-03-28 17:49:29 UTC (rev 431) @@ -131,7 +131,6 @@ return new CellValueParser(voyage, cellDAO); } - public static interface ResultAble { void addResult(Result value); } @@ -148,8 +147,9 @@ } } - public static ValueParser<Result> newResultValueParser(DataMetadata metadata) { - return new ResultValueParser(metadata); + public static ValueParser<Result> newResultValueParser( + DataMetadata metadata, boolean useFillValue) { + return new ResultValueParser(metadata, useFillValue); } } Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2012-03-28 17:44:08 UTC (rev 430) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/csv/ResultValueParser.java 2012-03-28 17:49:29 UTC (rev 431) @@ -40,15 +40,24 @@ final DataMetadata metadata; - public ResultValueParser(DataMetadata metadata) { + final boolean useFillValue; + + public ResultValueParser(DataMetadata metadata, boolean useFillValue) { this.metadata = metadata; + this.useFillValue = useFillValue; } @Override public Result parse(String value) throws ParseException { + Result result = new ResultImpl(); result.setDataMetadata(metadata); result.setResultValue(value); + if ("NA".equals(value) && useFillValue) { + + // use metadata fillValue + result.setResultValue(String.valueOf(metadata.getFillValue())); + } return result; } }