Mercurial > dive4elements > river
changeset 9408:66a43d9f65c8
Renamed salix column to iota
| author | mschaefer |
|---|---|
| date | Thu, 16 Aug 2018 08:44:26 +0200 |
| parents | 43c975f8ab92 |
| children | 38201f5b0dd9 |
| files | backend/src/main/java/org/dive4elements/river/importer/Config.java backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/SalixParser.java |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/Config.java Wed Aug 15 16:26:22 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/Config.java Thu Aug 16 08:44:26 2018 +0200 @@ -134,7 +134,7 @@ } private enum UInfoSkip { - SALIX("salix"), // + SALIX("iota"), // VEGETATION("vegetation"); private final String name;
--- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/SalixParser.java Wed Aug 15 16:26:22 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/SalixParser.java Thu Aug 16 08:44:26 2018 +0200 @@ -44,7 +44,7 @@ private static final Pattern META_EVALUATOR = Pattern.compile("^#\\sAuswerter:\\s*([^;]*).*", Pattern.CASE_INSENSITIVE); private enum ColTitlePattern { - FACTOR("Salix.Fa.tor\\s*\\[(.*)\\].*"), // + FACTOR("Iota\\s*\\[(.*)\\].*"), // MWMNW("\\(MW-MNW\\).*\\[(.*)\\].*"); private final Pattern pattern; @@ -129,7 +129,7 @@ } } if ((this.cols.get(ColTitlePattern.FACTOR) < 0) || (this.cols.get(ColTitlePattern.MWMNW) < 0)) { - logError("Column of the salix factor and/or mnw-mw-diff could not be identified"); + logError("Column of the iota value and/or mnw-mw-diff could not be identified"); this.headerParsingState = ParsingState.STOP; return false; } @@ -139,7 +139,7 @@ @Override protected SalixKmLineImport createKmLineImport(final Double km, final String[] values) { if (Double.isNaN(parseDoubleWithNull(values[this.cols.get(ColTitlePattern.FACTOR)]).doubleValue())) { - logError("Salix factor not found in line " + this.in.getLineNumber()); + logError("Iota not found in line " + this.in.getLineNumber()); return null; } if (Double.isNaN(parseDoubleWithNull(values[this.cols.get(ColTitlePattern.MWMNW)]).doubleValue())) {