Mercurial > dive4elements > river
changeset 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 | d518a42cdcd3 |
| children | cc21c197d204 |
| files | backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Fri Jun 14 16:46:33 2013 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/FlowVelocityModelParser.java Mon Jun 17 17:16:25 2013 +0200 @@ -49,10 +49,10 @@ Pattern.compile("([0-9]++)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*)"); private static final Pattern META_MAINVALUE_D = - Pattern.compile("(([0-9]*)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*)) bis (([0-9]*)\\s?(\\w*)|([0-9]++,[0-9]++)\\s?(\\w*))"); + 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()]*))"); private static final Pattern META_MAINVALUE_E = - Pattern.compile("(([a-zA-Z]+)+(\\d+)*) bis (([a-zA-Z]+)+(\\d+)*)"); + Pattern.compile("(([a-zA-Z]+)+(\\d+)*) bis (([a-zA-Z]+)+(\\d+)*[a-zA-Z()]*)"); private static final NumberFormat nf = NumberFormat.getInstance(DEFAULT_LOCALE);