Mercurial > dive4elements > river
annotate backend/src/main/java/org/dive4elements/river/importer/parsers/WaterlevelDifferencesParser.java @ 8989:2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
author | mschaefer |
---|---|
date | Mon, 09 Apr 2018 09:07:00 +0200 |
parents | 5e38e2924c07 |
children | c43d8c1a4455 |
rev | line source |
---|---|
5844
4dd33b86dc61
Added header to river backend.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
1 /* Copyright (C) 2011, 2012, 2013 by Bundesanstalt für Gewässerkunde |
4dd33b86dc61
Added header to river backend.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
2 * Software engineering by Intevation GmbH |
4dd33b86dc61
Added header to river backend.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
3 * |
5992
4c3ccf2b0304
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5844
diff
changeset
|
4 * This file is Free Software under the GNU AGPL (>=v3) |
5844
4dd33b86dc61
Added header to river backend.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
5 * and comes with ABSOLUTELY NO WARRANTY! Check out the |
5992
4c3ccf2b0304
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5844
diff
changeset
|
6 * documentation coming with Dive4Elements River for details. |
5844
4dd33b86dc61
Added header to river backend.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
7 */ |
4dd33b86dc61
Added header to river backend.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5838
diff
changeset
|
8 |
5829
18619c1e7c2a
Repaired internal references.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5828
diff
changeset
|
9 package org.dive4elements.river.importer.parsers; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
10 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
11 import java.io.File; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
12 import java.io.IOException; |
5229
016616df35dc
WaterlevelDifferencesParser: In analogy to WaterlevelParser, allow model
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
4193
diff
changeset
|
13 import java.math.BigDecimal; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
14 import java.text.NumberFormat; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
15 import java.util.ArrayList; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
16 import java.util.List; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
17 import java.util.regex.Matcher; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
18 import java.util.regex.Pattern; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
19 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
20 import org.apache.log4j.Logger; |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
21 import org.dive4elements.river.backend.utils.DateUtil; |
6291
33ccce4a3aae
WaterlevelDifferencesParser: issue1354/1, set timeintervals from waterdiff-csvs.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6290
diff
changeset
|
22 import org.dive4elements.river.importer.ImportTimeInterval; |
5829
18619c1e7c2a
Repaired internal references.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5828
diff
changeset
|
23 import org.dive4elements.river.importer.ImportUnit; |
18619c1e7c2a
Repaired internal references.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5828
diff
changeset
|
24 import org.dive4elements.river.importer.ImportWst; |
18619c1e7c2a
Repaired internal references.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
5828
diff
changeset
|
25 import org.dive4elements.river.importer.ImportWstColumn; |
6320
6cdafb6feee1
issue1335: Set a single (0) QRange for Waterlevel diffs from csv.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6291
diff
changeset
|
26 import org.dive4elements.river.importer.ImportWstColumnValue; |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
27 import org.dive4elements.river.importer.ImportWstQRange; |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
28 import org.dive4elements.river.importer.common.AbstractParser; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
29 |
5229
016616df35dc
WaterlevelDifferencesParser: In analogy to WaterlevelParser, allow model
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
4193
diff
changeset
|
30 |
016616df35dc
WaterlevelDifferencesParser: In analogy to WaterlevelParser, allow model
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
4193
diff
changeset
|
31 /** |
016616df35dc
WaterlevelDifferencesParser: In analogy to WaterlevelParser, allow model
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
4193
diff
changeset
|
32 * Parse WaterlevelDifferences CSV file. |
016616df35dc
WaterlevelDifferencesParser: In analogy to WaterlevelParser, allow model
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
4193
diff
changeset
|
33 */ |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
34 public class WaterlevelDifferencesParser extends LineParser { |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
35 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
36 private static final Logger log = |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
37 Logger.getLogger(WaterlevelDifferencesParser.class); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
38 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
39 private static final NumberFormat nf = |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
40 NumberFormat.getInstance(DEFAULT_LOCALE); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
41 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
42 public static final Pattern META_UNIT = |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
43 Pattern.compile("^Einheit: \\[(.*)\\].*"); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
44 |
6287
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
45 public static final Pattern YEARS_IN_COLUMN = |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
46 Pattern.compile(".*(\\d{4})-(\\d{4})$"); |
6287
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
47 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
48 public static final BigDecimal INTERVAL_GAP = new BigDecimal("0.00001"); |
7377
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
49 |
5233
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
50 /** List of parsed differences as ImportWst s. */ |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
51 private final List<ImportWst> differences; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
52 |
5233
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
53 private ImportWstColumn[] columns; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
54 |
5233
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
55 /** The currently processed dataset. */ |
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
56 private ImportWst current; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
57 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
58 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
59 public WaterlevelDifferencesParser() { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
60 this.differences = new ArrayList<>(); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
61 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
62 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
63 |
5233
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
64 /** Get the differences as wst parsed so far. */ |
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
65 public List<ImportWst> getDifferences() { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
66 return this.differences; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
67 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
68 |
5234
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
69 |
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
70 /** |
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
71 * Parse a csv waterleveldifferenceparser and create a ImportWst object |
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
72 * from it. |
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
73 */ |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
74 @Override |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
75 public void parse(final File file) throws IOException { |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
76 this.current = new ImportWst(file.getName()); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
77 this.current.setKind(6); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
78 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
79 super.parse(file); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
80 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
81 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
82 |
5234
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
83 /** No rewind implemented. */ |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
84 @Override |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
85 protected void reset() { |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
86 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
87 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
88 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
89 @Override |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
90 protected void finish() { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
91 if (this.columns != null && this.current != null) { |
5233
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
92 // TODO figure out if its needed, as the columns |
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
93 // are registered at their construction time. |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
94 for (final ImportWstColumn col: this.columns) { |
5233
37ff7c030ec9
WaterlevelDifferencesParser: Create ImportWsts directly.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5230
diff
changeset
|
95 // TODO place a current.addColumn(col); here? |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
96 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
97 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
98 this.differences.add(this.current); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
99 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
100 |
6320
6cdafb6feee1
issue1335: Set a single (0) QRange for Waterlevel diffs from csv.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6291
diff
changeset
|
101 // For all differences columns, add a single Q-Range with |
7377
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
102 // -1. |
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
103 // Expand range to minimal length in case it would be 0 |
7883
fc8d5b5f2c99
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7377
diff
changeset
|
104 // TODO: should otherwise be extended to |
fc8d5b5f2c99
Removed trailing whitespace.
Sascha L. Teichmann <teichmann@intevation.de>
parents:
7377
diff
changeset
|
105 // (first station of next range - INTERVAL_GAP), |
7377
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
106 // assuming always ascending stations |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
107 for (final ImportWstColumn column: this.columns) { |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
108 final List<ImportWstColumnValue> cValues = column.getColumnValues(); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
109 final BigDecimal a = cValues.get(0).getPosition(); |
7377
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
110 BigDecimal b = cValues.get(cValues.size() - 1).getPosition(); |
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
111 if (a.compareTo(b) == 0) { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
112 b = b.add(INTERVAL_GAP); |
7377
ad2fdc34910a
Importer: Avoid 0-lenght Q-ranges in WST-CSV-parsers.
Tom Gottfried <tom@intevation.de>
parents:
6753
diff
changeset
|
113 } |
6320
6cdafb6feee1
issue1335: Set a single (0) QRange for Waterlevel diffs from csv.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6291
diff
changeset
|
114 column.addColumnQRange( |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
115 new ImportWstQRange( |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
116 a, |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
117 b, |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
118 new BigDecimal(-1d)) |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
119 ); |
6320
6cdafb6feee1
issue1335: Set a single (0) QRange for Waterlevel diffs from csv.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6291
diff
changeset
|
120 } |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
121 this.current = null; |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
122 this.columns = null; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
123 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
124 |
5234
d1e24f26dee0
WaterlevelDifferencesParser: Doc and cosmetics.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5233
diff
changeset
|
125 |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
126 @Override |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
127 protected void handleLine(final int lineNum, final String line) { |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
128 if (line.startsWith(START_META_CHAR)) { |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
129 handleMetaLine(stripMetaLine(line)); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
130 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
131 else { |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
132 handleDataLine(line); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
133 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
134 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
135 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
136 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
137 private void handleMetaLine(final String meta) { |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
138 if (handleMetaUnit(meta)) { |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
139 return; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
140 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
141 else { |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
142 handleMetaColumnNames(meta); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
143 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
144 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
145 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
146 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
147 private boolean handleMetaUnit(final String meta) { |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
148 final Matcher m = META_UNIT.matcher(meta); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
149 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
150 if (m.matches()) { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
151 final String unit = m.group(1); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
152 log.debug("Found unit: '" + unit + "'"); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
153 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
154 this.current.setUnit(new ImportUnit(unit)); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
155 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
156 return true; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
157 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
158 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
159 return false; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
160 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
161 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
162 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
163 private boolean handleMetaColumnNames(final String meta) { |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
164 final Pattern META_COLUMN_NAMES = Pattern.compile("Fluss-km;(.*)"); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
165 final Matcher m = META_COLUMN_NAMES.matcher(meta); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
166 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
167 if (m.matches()) { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
168 final String colStr = m.group(1); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
169 final String[] cols = colStr.split(SEPERATOR_CHAR); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
170 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
171 log.debug("Found " + cols.length + " columns."); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
172 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
173 initColumns(cols); |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
174 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
175 return true; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
176 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
177 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
178 return false; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
179 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
180 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
181 |
6286 | 182 /** Setup column structures with name, description and time interval. */ |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
183 private void initColumns(final String[] cols) { |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
184 this.current.setNumberColumns(cols.length); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
185 this.columns = this.current.getColumns().toArray( |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
186 new ImportWstColumn[cols.length]); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
187 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
188 for (int i = 0; i < cols.length; i++) { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
189 final String name = cols[i].replace("\"", ""); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
190 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
191 log.debug("Create new column '" + name + "'"); |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
192 final ImportWstColumn column = this.current.getColumn(i); |
6290
db7d0600d39d
Minor refac.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6287
diff
changeset
|
193 column.setName(name); |
db7d0600d39d
Minor refac.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6287
diff
changeset
|
194 column.setDescription(name); |
6287
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
195 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
196 final Matcher m = YEARS_IN_COLUMN.matcher(name); |
6287
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
197 |
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
198 if (m.matches()) { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
199 final int startYear = Integer.parseInt(m.group(1)); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
200 final int endYear = Integer.parseInt(m.group(2)); |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
201 final ImportTimeInterval time = new ImportTimeInterval( |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
202 DateUtil.getStartDateFromYear(startYear), |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
203 DateUtil.getEndDateFromYear(endYear) |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
204 ); |
6291
33ccce4a3aae
WaterlevelDifferencesParser: issue1354/1, set timeintervals from waterdiff-csvs.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6290
diff
changeset
|
205 column.setTimeInterval(time); |
6287
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
206 } else { |
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
207 log.debug("No time interval in column header found: " + name); |
8d9e9b1ded7d
Waterl.Diff.Parser issue1354: Extract years from name, to later set timeintervals.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6286
diff
changeset
|
208 } |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
209 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
210 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
211 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
212 |
6752
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
213 /** Handle one line of data, add one value for all columns. |
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
214 * @param line the line to parse |
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
215 */ |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
216 private void handleDataLine(final String line) { |
6753
e032e9e6d09e
issue1433: Include trailing empty strings in stringsplit, this prevents emission
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6752
diff
changeset
|
217 // Split by separator, do not exclude trailing empty string. |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
218 final String[] cols = line.split(SEPERATOR_CHAR, -1); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
219 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
220 if (cols == null || cols.length < 2) { |
5230
fb7d43ba8147
WaterlevelDifferencesParser: Cosmetics and fix misleading debug output.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
5229
diff
changeset
|
221 log.warn("skip invalid waterlevel-diff line: '" + line + "'"); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
222 return; |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
223 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
224 |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
225 try { |
8856 | 226 // The first value in a line like 12,9;4,3;4,5 is the station, |
227 // later real values. | |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
228 final BigDecimal station = AbstractParser.parseDecimal(cols[0]); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
229 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
230 for (int i = 0; i < this.columns.length; i++) { |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
231 final int idx = i+1; |
3940
aed7aba93718
Improved logging and stabilized minfo import.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2850
diff
changeset
|
232 |
aed7aba93718
Improved logging and stabilized minfo import.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2850
diff
changeset
|
233 if (idx >= cols.length) { |
aed7aba93718
Improved logging and stabilized minfo import.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2850
diff
changeset
|
234 log.warn("Insufficient column numbers: " + line); |
aed7aba93718
Improved logging and stabilized minfo import.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2850
diff
changeset
|
235 continue; |
aed7aba93718
Improved logging and stabilized minfo import.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2850
diff
changeset
|
236 } |
aed7aba93718
Improved logging and stabilized minfo import.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
2850
diff
changeset
|
237 |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
238 final String value = cols[idx]; |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
239 |
6752
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
240 if (value != null && !value.equals("")) { |
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
241 try { |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
242 this.columns[i].addColumnValue( |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
243 station, |
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
244 AbstractParser.parseDecimal(value)); |
6752
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
245 } |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
246 catch (final NumberFormatException pe) { |
6752
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
247 log.warn("Could not parse value: '" + value + "'"); |
f275aae00c55
issue1433: Do not emit warning when tolerated empty string as value.
Felix Wolfsteller <felix.wolfsteller@intevation.de>
parents:
6321
diff
changeset
|
248 } |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
249 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
250 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
251 } |
8989
2693bfaf503d
Fixed several BigDecimal(double) creations by BigDecimal(String) parsing to avoid unnecessary decimal digits
mschaefer
parents:
8856
diff
changeset
|
252 catch (final NumberFormatException pe) { |
5490
b3dd14fc13a6
Parsers: do not call warnings error
Tom Gottfried <tom.gottfried@intevation.de>
parents:
5264
diff
changeset
|
253 log.warn("Could not parse station: '" + line + "'"); |
2850
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
254 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
255 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
256 } |
a1402c16152f
Added a parser and importer classes used to import waterlevel differences.
Ingo Weinzierl <ingo.weinzierl@intevation.de>
parents:
diff
changeset
|
257 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |