Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/parsers/SQRelationParser.java @ 5498:d459a885c51f
Schema change: make sq_relation_value.qmax NOT NULL and more informative messages in parser
author | Tom Gottfried <tom.gottfried@intevation.de> |
---|---|
date | Thu, 28 Mar 2013 14:02:52 +0100 |
parents | 9d11717538ec |
children |
comparison
equal
deleted
inserted
replaced
5497:5d99cd6e146a | 5498:d459a885c51f |
---|---|
117 Double rSq = parseDouble(cols[9], line); | 117 Double rSq = parseDouble(cols[9], line); |
118 Integer nTot = parseInteger(cols[10], line); | 118 Integer nTot = parseInteger(cols[10], line); |
119 Integer nOutlier = parseInteger(cols[11], line); | 119 Integer nOutlier = parseInteger(cols[11], line); |
120 Double cFer = parseDouble(cols[12], line); | 120 Double cFer = parseDouble(cols[12], line); |
121 Double cDuan = parseDouble(cols[13], line); | 121 Double cDuan = parseDouble(cols[13], line); |
122 if (km == null || a == null || b == null || cols[1].length() == 0) { | 122 if (km == null || a == null || b == null || |
123 log.error("Incomplete SQ-relation row (missing km, a, b or parameter): " | 123 qMax == null || cols[1].length() == 0) { |
124 + line); | 124 if (km == null) { |
125 return; | 125 log.error("No km for measurement station: Can not reference measurement station: " |
126 + line); | |
127 } | |
128 if ( a == null || b == null || | |
129 qMax == null || cols[1].length() == 0) { | |
130 log.error("Incomplete SQ-relation row (missing a, b, Qmax or parameter): " | |
131 + line); | |
132 } | |
133 return; | |
126 } | 134 } |
127 current.addValue(new ImportSQRelationValue( | 135 current.addValue(new ImportSQRelationValue( |
128 cols[1], | 136 cols[1], |
129 km, | 137 km, |
130 a, | 138 a, |
141 Double result = null; | 149 Double result = null; |
142 try { | 150 try { |
143 result = Double.valueOf(value.replace(",", ".")); | 151 result = Double.valueOf(value.replace(",", ".")); |
144 } | 152 } |
145 catch (NumberFormatException nfe) { | 153 catch (NumberFormatException nfe) { |
146 log.warn("parsing " + value + " in sq relation row: " + line); | 154 log.warn("Unparseable " + value + " in sq relation row: " + line); |
147 } | 155 } |
148 return result; | 156 return result; |
149 } | 157 } |
150 | 158 |
151 private Integer parseInteger(String value, String line) { | 159 private Integer parseInteger(String value, String line) { |
152 Integer result = null; | 160 Integer result = null; |
153 try { | 161 try { |
154 result = Integer.valueOf(value); | 162 result = Integer.valueOf(value); |
155 } | 163 } |
156 catch (NumberFormatException nfe) { | 164 catch (NumberFormatException nfe) { |
157 log.warn("parsing " + value + " in sq relation row: " + line); | 165 log.warn("Unparseable " + value + " in sq relation row: " + line); |
158 } | 166 } |
159 return result; | 167 return result; |
160 } | 168 } |
161 } | 169 } |
162 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 170 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |