Mercurial > dive4elements > river
changeset 5014:97dfb065a300 dami
merge
author | Tom Gottfried <tom.gottfried@intevation.de> |
---|---|
date | Tue, 19 Feb 2013 10:00:50 +0100 |
parents | eecd1ebba128 (current diff) a79f6a085ab6 (diff) |
children | 808718c6de97 |
files | |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-backend/contrib/shpimporter/shpimporter.py Tue Feb 19 09:57:57 2013 +0100 +++ b/flys-backend/contrib/shpimporter/shpimporter.py Tue Feb 19 10:00:50 2013 +0100 @@ -117,7 +117,8 @@ return True elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines): return True - elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints): + elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints) and \ + not isinstance(importer, HWSLines): return True elif config.skip_gauge_locations == 1 and isinstance(importer, GaugeLocation): return True @@ -234,6 +235,8 @@ else: logger.info("Inserting DGM meta information in 'dem' table.") insertRiverDgm(dbconn_raw, dgmfilename, river_name, config.dry_run) + else: + logger.info("Skip import of DGM.") if __name__ == '__main__': main()