Changeset 2682 for simo

Timestamp:

01/10/12 06:07:12 (4 months ago)

Author:

joni

Message:

enhancement: warning on bad spatialite lib

Location:

simo/trunk

Files:

• dev/utils/copy_spatialite.py (modified) (1 diff)
• simulator/test/runner_with_spatial.ini (modified) (1 diff)
• src/simo/db/datadb/db.py (modified) (1 diff)

simo/trunk/dev/utils/copy_spatialite.py

@@ -9 +9 @@
 datadb_path = os.path.join(base, 'src/simo/db/datadb')
 spatia_path = 'parts/spatialite/lib'
-iconv_path = 'parts/libiconv/lib'
 
 if sys.platform.startswith('darwin'):
     libfile = 'libspatialite.dylib'
-    icofile = ''
 elif sys.platform.startswith('linux'):
     libfile = 'libspatialite.so'
-    icofile = 'libiconv.so'
 else:
     #no buildout for windows unfortunately
     libfile = 'libspatialite-2.dll'
-    icofile = ''
 
 if not sys.platform.startswith('win'):

simo/trunk/simulator/test/runner_with_spatial.ini

@@ -12 +12 @@
 
 # These should usually be false if not dealing with concurrent db access.
+# no_wipe prevents wiping old data from the database
 no_wipe_import=0
 no_wipe_simulate=0
 no_wipe_optimize=0
+# As per above.
+# no_exec causes the database to store up all sql executions instead of running
+no_exec_import=0
+no_exec_simulate=0
+no_exec_optimize=0
+no_exec_logger=0
 
 # code profiling should be set to false, used in development

simo/trunk/src/simo/db/datadb/db.py

@@ -1069 +1069 @@
             self.load_extension(absfile)
         except Exception, e: #fallback to system lib
+            if not sys.platform.startswith('win'):
+                self.logger.warning('Failed to load spatialite (%s), '\
+                                    'falling back to system library' \
+                                    % (str(e),))
             self.load_extension(libfile)
         if first: