# HG changeset patch # User Tom Gottfried # Date 1362581200 -3600 # Node ID 6553c8e364dbc7e08171a718fb83a0bb22a2a40e # Parent b3a15fa3d88e1bb9d15b1e421f3ede1ed3a534a4 import gauge number by default (made by S. Teichmann) diff -r b3a15fa3d88e -r 6553c8e364db flys-backend/contrib/import_river.sh --- a/flys-backend/contrib/import_river.sh Tue Mar 05 18:54:28 2013 +0100 +++ b/flys-backend/contrib/import_river.sh Wed Mar 06 15:46:40 2013 +0100 @@ -209,7 +209,6 @@ -Dflys.backend.importer.skip.flood.water=false \ -Dflys.backend.importer.skip.flood.protection=false \ -Dflys.backend.importer.skip.gauges=false \ - -Dflys.backend.sta.parse.gauge.numbers=true \ -Dflys.backend.importer.skip.historical.discharge.tables=false \ -Dflys.backend.importer.skip.hyks=false \ -Dflys.backend.importer.skip.official.lines=false \ diff -r b3a15fa3d88e -r 6553c8e364db flys-backend/src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java --- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java Tue Mar 05 18:54:28 2013 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/StaFileParser.java Wed Mar 06 15:46:40 2013 +0100 @@ -30,8 +30,8 @@ public static final String TYPES = System.getProperty("flys.backend.main.value.types", "QWTD"); - public static final boolean PARSE_GAUGE_NUMBERS = - Boolean.getBoolean("flys.backend.sta.parse.gauge.numbers"); + public static final boolean NOT_PARSE_GAUGE_NUMBERS = + Boolean.getBoolean("flys.backend.sta.not.parse.gauge.numbers"); public static final Pattern QWTD_ = Pattern.compile("\\s*([^\\s]+)\\s+([^\\s]+)\\s+([" + @@ -68,7 +68,7 @@ Long gaugeNumber = null; - if (PARSE_GAUGE_NUMBERS) { + if (!NOT_PARSE_GAUGE_NUMBERS) { String gaugeNumberString = line.substring(0, 16).trim(); try {