[Dive4elements-commits] [PATCH 2 of 2] merge

[Wald Commits]

# HG changeset patch
# User Tom Gottfried <tom.gottfried at intevation.de>
# Date 1361264450 -3600
# Branch dami
# Node ID 97dfb065a3001f5b2a5bdbac89ed576307233723
# Parent  eecd1ebba128a036269f1297c7dab85aa1b2031e
# Parent  a79f6a085ab60faadbfa3166baab890e6606635a
merge

diff -r eecd1ebba128 -r 97dfb065a300 flys-backend/contrib/shpimporter/shpimporter.py
--- 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()