--- a/flys-backend/contrib/shpimporter/shpimporter.py	Wed Aug 22 11:55:55 2012 +0000
+++ b/flys-backend/contrib/shpimporter/shpimporter.py	Wed Aug 22 13:04:05 2012 +0000
@@ -62,6 +62,7 @@
     parser.add_option("--password", type="string")
     parser.add_option("--river_id", type="int")
     parser.add_option("--verbose", type="int", default=1)
+    parser.add_option("--dry_run", type="int", default=0)
     parser.add_option("--skip_axis", type="int")
     parser.add_option("--skip_hydr_boundaries", type="int")
     parser.add_option("--skip_buildings", type="int")
@@ -134,10 +135,12 @@
         return
 
     if config == None:
-        print "No Config"
         ERROR("Unable to read config from command line!")
         return
 
+    if config.dry_run > 0:
+        INFO("You enable 'dry_run'. No database transaction will take place!")
+
     importers = getImporters(config)
     types = {}
 
@@ -149,13 +152,14 @@
         INFO("Start import of '%s'" % importer.getName())
 
         shapes = utils.findShapefiles(importer.getPath(config.directory))
-        INFO("Found %i Shapefiles" % len(shapes))
+        DEBUG("Found %i Shapefiles" % len(shapes))
 
         for shpTuple in shapes:
             geomType = importer.walkOverShapes(shpTuple)
             try:
-                num = types[geomType]
-                types[geomType] = num+1
+                if geomType is not None:
+                    num = types[geomType]
+                    types[geomType] = num+1
             except:
                 types[geomType] = 1