# HG changeset patch # User Tom Gottfried # Date 1362506068 -3600 # Node ID b3a15fa3d88e1bb9d15b1e421f3ede1ed3a534a4 # Parent 14d19313268adda471b94ea8292ca3f45d4b01a5 let import_river.sh parse gauge official numbers, typo diff -r 14d19313268a -r b3a15fa3d88e flys-backend/contrib/import_river.sh --- a/flys-backend/contrib/import_river.sh Tue Mar 05 09:51:55 2013 +0100 +++ b/flys-backend/contrib/import_river.sh Tue Mar 05 18:54:28 2013 +0100 @@ -209,6 +209,7 @@ -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 14d19313268a -r b3a15fa3d88e flys-backend/contrib/shpimporter/importer.py --- a/flys-backend/contrib/shpimporter/importer.py Tue Mar 05 09:51:55 2013 +0100 +++ b/flys-backend/contrib/shpimporter/importer.py Tue Mar 05 18:54:28 2013 +0100 @@ -49,7 +49,7 @@ """ Searches for a field in the current src layer that matches the expression regex. - Throws an exception if more then one field matches + Throws an exception if more than one field matches @param feat: The feature to search for attributes @param regex: The regex to look for @@ -67,7 +67,7 @@ match = re.match(regex, name, re.IGNORECASE) if match: if result: - raise Exception("More then one field matches: %s" % regex) + raise Exception("More than one field matches: %s" % regex) else: result = match.group(0) return result