Changes in grass-addons/grass7/vector/v.in.natura2000/v.in.natura2000.py [66995:67009]

File:

• grass-addons/grass7/vector/v.in.natura2000/v.in.natura2000.py (modified) (4 diffs)

grass-addons/grass7/vector/v.in.natura2000/v.in.natura2000.py

@@ -118 +118 @@
 import tempfile
 import grass.script as grass
-try:
-    import pyspatialite.dbapi2 as db
-except ImportError:
-    grass.warning( "pyspatialite has to be installed." )
 
 if not os.environ.has_key("GISBASE"):
@@ -152 +148 @@
     list_site_type = flags['t']
     global tmp   
- 
+
+    try:
+                import pyspatialite.dbapi2 as db
+    except:
+                grass.fatal( "pyspatialite is needed to run this script.\n"
+                                     "source: https://pypi.python.org/pypi/pyspatialite \n"
+                                     "Please activate/install it in your python stack.")        
+
     if list_n2k_layer :
         grass.message( "Available data layer(s):" )
@@ -180 +183 @@
         conn = db.connect("%s" % n2k_input)
         c = conn.cursor()
-        for row in c.execute('SELECT HABITATCODE, DESCRIPTION FROM HABITATS GROUP BY HABITATCODE'):     
-                grass.message( row )
+        try:
+            for row in c.execute('SELECT HABITATCODE, DESCRIPTION FROM HABITATS GROUP BY HABITATCODE'): 
+                    grass.message( row )
+        except:
+            pass
+            grass.warning("Some problems querying habitat code or names occurred."
+                          " Please check columns HABITATCODE and DESCRIPTION of table HABITATS in the sqlite database.")
         conn.close()
 
@@ -188 +196 @@
         conn = db.connect("%s" % n2k_input)
         c = conn.cursor()
-        for row in c.execute('SELECT SPECIESCODE, SPECIESNAME FROM SPECIES GROUP BY SPECIESCODE'):      
-                grass.message( row )
+        try:
+            for row in c.execute('SELECT SPECIESCODE, SPECIESNAME FROM SPECIES GROUP BY SPECIESCODE'):  
+                    grass.message( row )
+        except:
+            pass
+            grass.warning("Some problems querying species code or names occurred."
+                          " Please check columns SPECIESCODE and SPECIESNAME of table SPECIES in the sqlite database.")
         conn.close()