Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java @ 6353:d50348a1506b double-precision
flow velocity model parser: accept braces in names of upper discharge
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Mon, 17 Jun 2013 17:16:25 +0200 |
| parents | 4ab5277e7e89 |
| children | a81fbbda28e7 |
comparison
equal
deleted
inserted
replaced
| 6338:d518a42cdcd3 | 6353:d50348a1506b |
|---|---|
| 47 | 47 |
| 48 private static final Pattern META_MAINVALUE_C = | 48 private static final Pattern META_MAINVALUE_C = |
| 49 Pattern.compile("([0-9]++)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*)"); | 49 Pattern.compile("([0-9]++)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*)"); |
| 50 | 50 |
| 51 private static final Pattern META_MAINVALUE_D = | 51 private static final Pattern META_MAINVALUE_D = |
| 52 Pattern.compile("(([0-9]*)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*)) bis (([0-9]*)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*))"); | 52 Pattern.compile("(([0-9]*)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*)) bis (([0-9]*)\\s?([a-zA-Z_0-9()]*)|([0-9]++,[0-9]++)\\s?([a-zA-Z_0-9()]*))"); |
| 53 | 53 |
| 54 private static final Pattern META_MAINVALUE_E = | 54 private static final Pattern META_MAINVALUE_E = |
| 55 Pattern.compile("(([a-zA-Z]+)+(\\d+)*) bis (([a-zA-Z]+)+(\\d+)*)"); | 55 Pattern.compile("(([a-zA-Z]+)+(\\d+)*) bis (([a-zA-Z]+)+(\\d+)*[a-zA-Z()]*)"); |
| 56 | 56 |
| 57 private static final NumberFormat nf = | 57 private static final NumberFormat nf = |
| 58 NumberFormat.getInstance(DEFAULT_LOCALE); | 58 NumberFormat.getInstance(DEFAULT_LOCALE); |
| 59 | 59 |
| 60 | 60 |