Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/parsers/SedimentYieldParser.java @ 5439:7aeb2c101628
removed unit from model and importer for grain fractions (its always mm, otherwise a typo)
author | Tom Gottfried <tom.gottfried@intevation.de> |
---|---|
date | Tue, 26 Mar 2013 18:04:59 +0100 |
parents | 8e66a200a0b9 |
children | b3dd14fc13a6 |
comparison
equal
deleted
inserted
replaced
5438:91b14ade2149 | 5439:7aeb2c101628 |
---|---|
283 String lowerB = a.group(3); | 283 String lowerB = a.group(3); |
284 | 284 |
285 String upperA = a.group(4); | 285 String upperA = a.group(4); |
286 String upperB = a.group(5); | 286 String upperB = a.group(5); |
287 | 287 |
288 String unitStr = a.group(7); | |
289 String lower = lowerA != null ? lowerA : lowerB; | 288 String lower = lowerA != null ? lowerA : lowerB; |
290 String upper = upperA != null ? upperA : upperB; | 289 String upper = upperA != null ? upperA : upperB; |
291 | 290 |
292 try { | 291 try { |
293 return new ImportGrainFraction( | 292 return new ImportGrainFraction( |
294 getGrainFractionTypeName(this.description), | 293 getGrainFractionTypeName(this.description), |
295 nf.parse(lower).doubleValue(), | 294 nf.parse(lower).doubleValue(), |
296 nf.parse(upper).doubleValue(), | 295 nf.parse(upper).doubleValue() |
297 new ImportUnit(unitStr) | |
298 ); | 296 ); |
299 } | 297 } |
300 catch (ParseException pe) { | 298 catch (ParseException pe) { |
301 log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'"); | 299 log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'"); |
302 } | 300 } |
306 if (b.matches()) { | 304 if (b.matches()) { |
307 String lowerA = b.group(4); | 305 String lowerA = b.group(4); |
308 String lowerB = b.group(5); | 306 String lowerB = b.group(5); |
309 String upperA = b.group(6); | 307 String upperA = b.group(6); |
310 String upperB = b.group(7); | 308 String upperB = b.group(7); |
311 String unitStr = b.group(9); | |
312 | 309 |
313 String lower = lowerA != null ? lowerA : lowerB; | 310 String lower = lowerA != null ? lowerA : lowerB; |
314 String upper = upperA != null ? upperA : upperB; | 311 String upper = upperA != null ? upperA : upperB; |
315 | 312 |
316 try { | 313 try { |
317 return new ImportGrainFraction( | 314 return new ImportGrainFraction( |
318 getGrainFractionTypeName(this.description), | 315 getGrainFractionTypeName(this.description), |
319 nf.parse(lower).doubleValue(), | 316 nf.parse(lower).doubleValue(), |
320 nf.parse(upper).doubleValue(), | 317 nf.parse(upper).doubleValue() |
321 new ImportUnit(unitStr) | |
322 ); | 318 ); |
323 } | 319 } |
324 catch (ParseException pe) { | 320 catch (ParseException pe) { |
325 log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'"); | 321 log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'"); |
326 } | 322 } |
328 | 324 |
329 Matcher c = META_GRAIN_FRACTION_C.matcher(gfStr); | 325 Matcher c = META_GRAIN_FRACTION_C.matcher(gfStr); |
330 if (c.matches()) { | 326 if (c.matches()) { |
331 String oper = c.group(1); | 327 String oper = c.group(1); |
332 String valueStr = c.group(3); | 328 String valueStr = c.group(3); |
333 String unitStr = c.group(6); | |
334 | 329 |
335 try { | 330 try { |
336 Double value = nf.parse(valueStr).doubleValue(); | 331 Double value = nf.parse(valueStr).doubleValue(); |
337 | 332 |
338 if (oper.equals(">")) { | 333 if (oper.equals(">")) { |
339 return new ImportGrainFraction( | 334 return new ImportGrainFraction( |
340 getGrainFractionTypeName(this.description), | 335 getGrainFractionTypeName(this.description), |
341 value, | 336 value, |
342 null, | 337 null |
343 new ImportUnit(unitStr) | |
344 ); | 338 ); |
345 } | 339 } |
346 else { | 340 else { |
347 return new ImportGrainFraction( | 341 return new ImportGrainFraction( |
348 getGrainFractionTypeName(this.description), | 342 getGrainFractionTypeName(this.description), |
349 null, | 343 null, |
350 value, | 344 value |
351 new ImportUnit(unitStr) | |
352 ); | 345 ); |
353 } | 346 } |
354 } | 347 } |
355 catch (ParseException pe) { | 348 catch (ParseException pe) { |
356 log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'"); | 349 log.warn("SYP: Error while parsing ranges of: '" + gfStr + "'"); |