Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java @ 7340:2ce7bacc940f double-precision
Merged changes from default into double precision branch.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Tue, 15 Oct 2013 18:41:55 +0200 |
| parents | c894b7b45c4c |
| children | 07cc4cd9233e |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Tue Oct 15 15:32:36 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java Tue Oct 15 18:41:55 2013 +0200 @@ -127,18 +127,21 @@ Integer nOutlier = parseInteger(cols[11], line); Double cFer = parseDouble(cols[12], line); Double cDuan = parseDouble(cols[13], line); - if (km == null || a == null || b == null || - qMax == null || cols[1].length() == 0) { - if (km == null) { - log.error("No km for measurement station: Can not reference measurement station: " - + line); - } - if ( a == null || b == null || - qMax == null || cols[1].length() == 0) { - log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): " - + line); - } - return; + + if (km == null || a == null || b == null + || qMax == null || cols[1].length() == 0 + ) { + if (km == null) { + log.error("No km for measurement station: Can not reference measurement station: " + + line); + } + if (a == null || b == null + || qMax == null || cols[1].length() == 0 + ) { + log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): " + + line); + } + return; } current.addValue(new ImportSQRelationValue( cols[1],