Mercurial > dive4elements > river
comparison flys-backend/contrib/shpimporter/shpimporter.py @ 5014:97dfb065a300 dami
merge
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Tue, 19 Feb 2013 10:00:50 +0100 |
| parents | a79f6a085ab6 |
| children | a5f438895a38 |
comparison
equal
deleted
inserted
replaced
| 5013:eecd1ebba128 | 5014:97dfb065a300 |
|---|---|
| 115 return True | 115 return True |
| 116 elif config.skip_floodplains == 1 and isinstance(importer, Floodplain): | 116 elif config.skip_floodplains == 1 and isinstance(importer, Floodplain): |
| 117 return True | 117 return True |
| 118 elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines): | 118 elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines): |
| 119 return True | 119 return True |
| 120 elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints): | 120 elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints) and \ |
| 121 not isinstance(importer, HWSLines): | |
| 121 return True | 122 return True |
| 122 elif config.skip_gauge_locations == 1 and isinstance(importer, GaugeLocation): | 123 elif config.skip_gauge_locations == 1 and isinstance(importer, GaugeLocation): |
| 123 return True | 124 return True |
| 124 elif config.skip_catchments == 1 and isinstance(importer, Catchment): | 125 elif config.skip_catchments == 1 and isinstance(importer, Catchment): |
| 125 return True | 126 return True |
| 232 logger.info("Could not find or access DGM file: %s \n" | 233 logger.info("Could not find or access DGM file: %s \n" |
| 233 "Skipping DGM import." % dgmfilename) | 234 "Skipping DGM import." % dgmfilename) |
| 234 else: | 235 else: |
| 235 logger.info("Inserting DGM meta information in 'dem' table.") | 236 logger.info("Inserting DGM meta information in 'dem' table.") |
| 236 insertRiverDgm(dbconn_raw, dgmfilename, river_name, config.dry_run) | 237 insertRiverDgm(dbconn_raw, dgmfilename, river_name, config.dry_run) |
| 238 else: | |
| 239 logger.info("Skip import of DGM.") | |
| 237 | 240 |
| 238 if __name__ == '__main__': | 241 if __name__ == '__main__': |
| 239 main() | 242 main() |