Mercurial > dive4elements > river
comparison flys-backend/contrib/shpimporter/shpimporter.py @ 4963:1469066cc7d9 dami
Importer: Fix the order of the config check
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Mon, 04 Feb 2013 17:54:39 +0100 |
parents | 7323847fa7df |
children | 174fbaa3d344 |
comparison
equal
deleted
inserted
replaced
4955:7323847fa7df | 4963:1469066cc7d9 |
---|---|
118 return True | 118 return True |
119 elif config.skip_fixpoints == 1 and isinstance(importer, Fixpoint): | 119 elif config.skip_fixpoints == 1 and isinstance(importer, Fixpoint): |
120 return True | 120 return True |
121 elif config.skip_floodplains == 1 and isinstance(importer, Floodplain): | 121 elif config.skip_floodplains == 1 and isinstance(importer, Floodplain): |
122 return True | 122 return True |
123 elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines): | |
124 return True | |
123 elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints): | 125 elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints): |
124 if not isinstance(importer, HWSLines): | |
125 return True | |
126 elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines): | |
127 return True | 126 return True |
128 elif config.skip_gauge_locations == 1 and isinstance(importer, GaugeLocation): | 127 elif config.skip_gauge_locations == 1 and isinstance(importer, GaugeLocation): |
129 return True | 128 return True |
130 elif config.skip_catchments == 1 and isinstance(importer, Catchment): | 129 elif config.skip_catchments == 1 and isinstance(importer, Catchment): |
131 return True | 130 return True |