[Dive4elements-commits] [PATCH] Importer: Fix the order of the config check

Wald Commits scm-commit at wald.intevation.org
Mon Feb 4 17:54:43 CET 2013


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1359996879 -3600
# Branch dami
# Node ID 1469066cc7d92783c5baed57295ba82462711b7f
# Parent  7323847fa7df74f1dd5999f67ce6d9935b5a0d49
Importer: Fix the order of the config check

diff -r 7323847fa7df -r 1469066cc7d9 flys-backend/contrib/shpimporter/shpimporter.py
--- a/flys-backend/contrib/shpimporter/shpimporter.py	Fri Feb 01 11:42:34 2013 +0100
+++ b/flys-backend/contrib/shpimporter/shpimporter.py	Mon Feb 04 17:54:39 2013 +0100
@@ -120,10 +120,9 @@
         return True
     elif config.skip_floodplains == 1 and isinstance(importer, Floodplain):
         return True
+    elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines):
+        return True
     elif config.skip_hws_points == 1 and isinstance(importer, HWSPoints):
-        if not isinstance(importer, HWSLines):
-            return True
-    elif config.skip_hws_lines == 1 and isinstance(importer, HWSLines):
         return True
     elif config.skip_gauge_locations == 1 and isinstance(importer, GaugeLocation):
         return True


More information about the Dive4elements-commits mailing list