comparison backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java @ 6415:1bdfc099286e double-precision

Flow Velocity Model Parser: another fix of main value guessing
author Tom Gottfried <tom.gottfried@intevation.de>
date Tue, 25 Jun 2013 13:22:25 +0200
parents 61e55f36e764
children 2ce7bacc940f
comparison
equal deleted inserted replaced
6414:61e55f36e764 6415:1bdfc099286e
38 38
39 private static final Pattern META_GAUGE = 39 private static final Pattern META_GAUGE =
40 Pattern.compile("(.*) Q=(\\w*)m3/s"); 40 Pattern.compile("(.*) Q=(\\w*)m3/s");
41 41
42 private static final Pattern META_MAINVALUE_A = 42 private static final Pattern META_MAINVALUE_A =
43 Pattern.compile("([a-zA-Z]+)+(\\d+)*\\S*"); 43 Pattern.compile("([a-zA-Z]+)+(\\d+)*[\\w()]*");
44 44
45 private static final Pattern META_MAINVALUE_B = 45 private static final Pattern META_MAINVALUE_B =
46 Pattern.compile("(([a-zA-Z]+)+(\\d+)*)\\s*-\\s*(([a-zA-Z]+)+(\\d+)*\\S*)"); 46 Pattern.compile("(([a-zA-Z]+)+(\\d+)*)\\s*-\\s*(([a-zA-Z]+)+(\\d+)*\\S*)");
47 47
48 private static final Pattern META_MAINVALUE_C = 48 private static final Pattern META_MAINVALUE_C =

http://dive4elements.wald.intevation.org