Commit graph

741 commits

Author SHA1 Message Date
Dane Springmeyer
328ecd8c78 use std::string as is convention and comment last bit of unused mutex support in connection manager 2011-11-19 11:35:07 -08:00
Dane Springmeyer
3d66455c64 ensure proper error output from postgis plugin - refs #955 2011-11-17 11:36:16 -08:00
Dane Springmeyer
e99e6da1e5 ensure proper error output from postgis plugin - refs #955 2011-11-17 11:36:16 -08:00
Dane Springmeyer
dddd6fa781 postgis: avoid empty error messages (closes #955) and more verbosity in general if postgres connection fails 2011-11-16 11:27:48 -08:00
Dane Springmeyer
ae68acf633 postgis: avoid empty error messages (closes #955) and more verbosity in general if postgres connection fails 2011-11-16 11:27:48 -08:00
Dane Springmeyer
baebf4f1f2 scons: get linking correct to sqlite dependecies if linking is static 2011-11-15 12:07:46 -08:00
Dane Springmeyer
a6608814d0 scons: get linking correct to sqlite dependecies if linking is static 2011-11-15 12:07:46 -08:00
kunitoki
1251a57e4e - allow occi to compile with new changes in mapnik::sql_utils
- cache table_from_sql instead of recomputing on each query
2011-11-15 14:04:58 +01:00
kunitoki
ef27ecf1cb - allow occi to compile with new changes in mapnik::sql_utils
- cache table_from_sql instead of recomputing on each query
2011-11-15 14:04:58 +01:00
Dane Springmeyer
41663b1941 csv: avoid invalid dereference 2011-11-14 00:34:26 -08:00
Dane Springmeyer
f8a9095e81 csv: avoid invalid dereference 2011-11-14 00:34:26 -08:00
Dane Springmeyer
39d199aa49 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
4654312d00 code formatting 2011-11-13 19:54:32 -08:00
Dane Springmeyer
62a5e457f1 plugin code formatting based on emacs format in utils/format_source_files 2011-11-13 19:37:50 -08:00
Dane Springmeyer
ce9e44b5f2 plugin code formatting based on emacs format in utils/format_source_files 2011-11-13 19:37:50 -08:00
Dane Springmeyer
5205960326 csv: code formatting 2011-11-13 19:33:57 -08:00
Dane Springmeyer
3fd56f82f5 csv: code formatting 2011-11-13 19:33:57 -08:00
Dane Springmeyer
b3b938a804 sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction 2011-11-13 19:19:22 -08:00
Dane Springmeyer
1653fe0b93 sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction 2011-11-13 19:19:22 -08:00
Dane Springmeyer
73feb36dba sqlite: trim all types of valid quote characters on table names 2011-11-13 16:41:54 -08:00
Dane Springmeyer
422d112d38 sqlite: trim all types of valid quote characters on table names 2011-11-13 16:41:54 -08:00
Dane Springmeyer
a527bb25e2 sqlite: step_next for a prepared statement must only return SQLITE_DONE 2011-11-13 16:41:34 -08:00
Dane Springmeyer
7ef5778d96 sqlite: step_next for a prepared statement must only return SQLITE_DONE 2011-11-13 16:41:34 -08:00
Dane Springmeyer
b1c2d9f680 sqlite: disassociate extent calculation from rtree auto-index creation, and grab immediate lock on rtree table 2011-11-13 16:02:27 -08:00
Dane Springmeyer
a4715aa8df sqlite: disassociate extent calculation from rtree auto-index creation, and grab immediate lock on rtree table 2011-11-13 16:02:27 -08:00
Dane Springmeyer
67682f1f36 update hello world build script 2011-11-11 17:03:21 -08:00
Dane Springmeyer
6f665bf7ec update hello world build script 2011-11-11 17:03:21 -08:00
Dane Springmeyer
1d881af35a reduce the size of plugin libraries by hiding unneeded symbols 2011-11-11 15:37:10 -08:00
Dane Springmeyer
c8b2ddfaba reduce the size of plugin libraries by hiding unneeded symbols 2011-11-11 15:37:10 -08:00
Dane Springmeyer
85b938806b fix csv plugin build 2011-11-11 12:17:39 -08:00
Dane Springmeyer
62753ad245 fix csv plugin build 2011-11-11 12:17:39 -08:00
Dane Springmeyer
df166f5eff ensure parallel builds work with csv plugin and kismet links to boost thread 2011-11-11 12:13:41 -08:00
Dane Springmeyer
6b98546466 ensure parallel builds work with csv plugin and kismet links to boost thread 2011-11-11 12:13:41 -08:00
Dane Springmeyer
4e4769745f sqlite: autoquote table names that start with numbers to better support natural earth conversions from shapefiles 2011-11-10 09:42:04 -08:00
Dane Springmeyer
5669226166 sqlite: autoquote table names that start with numbers to better support natural earth conversions from shapefiles 2011-11-10 09:42:04 -08:00
Dane Springmeyer
89e13d304d sqlite: return success or failure from rtree indexing function and report available tables if the pragma table_info() fails 2011-11-09 19:18:12 -08:00
Dane Springmeyer
bdc726a525 sqlite: return success or failure from rtree indexing function and report available tables if the pragma table_info() fails 2011-11-09 19:18:12 -08:00
Dane Springmeyer
d6cc803ef9 sqlite: proper cleanup if rtree index creation fails 2011-11-09 17:44:50 -08:00
Dane Springmeyer
3ed640a15f sqlite: proper cleanup if rtree index creation fails 2011-11-09 17:44:50 -08:00
Dane Springmeyer
a058639b24 use c++ style includes 2011-11-09 16:45:18 -08:00
Dane Springmeyer
40ae0efd26 use c++ style includes 2011-11-09 16:45:18 -08:00
Dane Springmeyer
2172e0a409 Merge pull request #943 from mapnik/sqlite-refactor
Sqlite refactor
2011-11-09 15:47:58 -08:00
Dane Springmeyer
b0bad47d78 Merge pull request #943 from mapnik/sqlite-refactor
Sqlite refactor
2011-11-09 15:47:58 -08:00
Artem Pavlenko
3194707fd3 use rint from global.hpp in windows 2011-11-08 11:50:56 +00:00
Artem Pavlenko
6b0e414aa1 use rint from global.hpp in windows 2011-11-08 11:50:56 +00:00
Dane Springmeyer
6b7635119c Merge branch 'master' into sqlite-refactor 2011-11-04 20:44:15 -07:00
Dane Springmeyer
dcd19e05e5 Merge branch 'master' into sqlite-refactor 2011-11-04 20:44:15 -07:00
Dane Springmeyer
da4a7af14c csv: detect as wkt columns with 'geom' substring and use more aggressive detection for blank lines 2011-11-04 07:18:40 -04:00
Dane Springmeyer
a6dfb7b6a4 csv: detect as wkt columns with 'geom' substring and use more aggressive detection for blank lines 2011-11-04 07:18:40 -04:00
Dane Springmeyer
6257ac57c9 sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
Dane Springmeyer
d965bcbeae sqlite: futher refactoring of sqlite plugin, allowing all tests to pass 2011-11-03 19:51:37 -04:00
Dane Springmeyer
a92c46ff5d Merge branch 'master' into sqlite-refactor 2011-11-03 09:44:02 -04:00
Dane Springmeyer
426b26650e Merge branch 'master' into sqlite-refactor 2011-11-03 09:44:02 -04:00
Dane Springmeyer
6c8e4b2de0 csv: back off of null and boolean detection since using strings is more predictable across rows 2011-11-02 11:07:59 -04:00
Dane Springmeyer
6295501ead csv: back off of null and boolean detection since using strings is more predictable across rows 2011-11-02 11:07:59 -04:00
Dane Springmeyer
1eff83530a csv: also start auto-detecting ';' and '|' characters as likely separators 2011-11-01 21:11:10 -04:00
Dane Springmeyer
e6ac5d8881 csv: also start auto-detecting ';' and '|' characters as likely separators 2011-11-01 21:11:10 -04:00
Dane Springmeyer
2dfb5e5489 csv: use braces in all cases 2011-11-01 20:48:30 -04:00
Dane Springmeyer
16ab2ba895 csv: use braces in all cases 2011-11-01 20:48:30 -04:00
Dane Springmeyer
4cec91ff82 csv: handle empty headers, an apparently common situation with large government data 2011-11-01 20:33:05 -04:00
Dane Springmeyer
7f2d3e09f2 csv: handle empty headers, an apparently common situation with large government data 2011-11-01 20:33:05 -04:00
Dane Springmeyer
705a573d29 csv: use unsigned to avoid compiler warnings 2011-11-01 11:55:23 -04:00
Dane Springmeyer
0d9170cda2 csv: use unsigned to avoid compiler warnings 2011-11-01 11:55:23 -04:00
Dane Springmeyer
bdb9857cf0 csv: remove protective string checks now that spirit parsing is working 2011-10-31 19:12:13 -04:00
Dane Springmeyer
b3c2bfef01 csv: remove protective string checks now that spirit parsing is working 2011-10-31 19:12:13 -04:00
Dane Springmeyer
b2c54c98dd csv: be more strict about spirit parsing, iterate headers list to avoid dropping trailing nulls, and fixup exception handling a bit 2011-10-31 19:09:29 -04:00
Dane Springmeyer
74d0af396e csv: be more strict about spirit parsing, iterate headers list to avoid dropping trailing nulls, and fixup exception handling a bit 2011-10-31 19:09:29 -04:00
Dane Springmeyer
80fbbfbf1b Merge branch 'master' into sqlite-refactor 2011-10-31 15:03:03 -04:00
Dane Springmeyer
08bdb2f36a Merge branch 'master' into sqlite-refactor 2011-10-31 15:03:03 -04:00
Dane Springmeyer
043a7e3c11 format error messages 2011-10-31 13:43:56 -04:00
Dane Springmeyer
69806f2728 format error messages 2011-10-31 13:43:56 -04:00
Dane Springmeyer
d20caee776 Merge branch 'master' into sqlite-refactor 2011-10-29 22:56:57 -07:00
Dane Springmeyer
d5eb3b4b9c Merge branch 'master' into sqlite-refactor 2011-10-29 22:56:57 -07:00
Dane Springmeyer
bcf4c2967e when statically linking, proj linking is needed for libgdal 2011-10-29 22:33:49 -07:00
Dane Springmeyer
820e1865dc when statically linking, proj linking is needed for libgdal 2011-10-29 22:33:49 -07:00
Dane Springmeyer
c760af4425 get feature count incrementing working more properly 2011-10-28 21:50:31 -07:00
Dane Springmeyer
225a8c4eaf get feature count incrementing working more properly 2011-10-28 21:50:31 -07:00
Dane Springmeyer
ffc92f1893 first pass at refactoring bind() to be more manageable in sqlite plugin - refs #928 2011-10-28 21:24:47 -07:00
Dane Springmeyer
03137cf523 first pass at refactoring bind() to be more manageable in sqlite plugin - refs #928 2011-10-28 21:24:47 -07:00
Dane Springmeyer
b4daf1a4b0 add option to ogr driver to force usage of a single driver when attempting to open files - can shave very slightly off of load times if ogr is built with a lot of drivers 2011-10-28 15:16:34 -07:00
Dane Springmeyer
988567e040 add option to ogr driver to force usage of a single driver when attempting to open files - can shave very slightly off of load times if ogr is built with a lot of drivers 2011-10-28 15:16:34 -07:00
kunitoki
535a730da3 - again forgot a refactoring that breaks the previous 2 commits. hopefully should compile now. 2011-10-24 12:05:01 +02:00
kunitoki
a061562866 - again forgot a refactoring that breaks the previous 2 commits. hopefully should compile now. 2011-10-24 12:05:01 +02:00
kunitoki
e9397ee98c - forgot a file in previous commit (closes #472 again) 2011-10-24 11:56:02 +02:00
kunitoki
2a7d41f1ff - forgot a file in previous commit (closes #472 again) 2011-10-24 11:56:02 +02:00
kunitoki
c314041a5a - implemented sql query in OGR plugin (closes #472) 2011-10-24 11:53:33 +02:00
kunitoki
088561bd5e - implemented sql query in OGR plugin (closes #472) 2011-10-24 11:53:33 +02:00
kunitoki
267ee85dea - copyright fixes in postgis plugin 2011-10-23 21:23:04 +02:00
kunitoki
290ca729ba - copyright fixes in postgis plugin 2011-10-23 21:23:04 +02:00
kunitoki
44ade30e7a - small copyright fix in ogr plugin 2011-10-23 21:21:28 +02:00
kunitoki
0026d23638 - small copyright fix in ogr plugin 2011-10-23 21:21:28 +02:00
kunitoki
cf3f6156c3 - aligned code style in geos plugin 2011-10-23 21:19:56 +02:00
kunitoki
9967132b78 - aligned code style in geos plugin 2011-10-23 21:19:56 +02:00
kunitoki
d7f68cc8f5 - copyright fixes in shape plugin 2011-10-23 21:09:59 +02:00
kunitoki
2cf56bf767 - copyright fixes in shape plugin 2011-10-23 21:09:59 +02:00
kunitoki
339d236bc3 - more coding style fixes in rasterlite plugin 2011-10-23 16:35:02 +02:00
kunitoki
49335bc00e - more coding style fixes in rasterlite plugin 2011-10-23 16:35:02 +02:00
kunitoki
78cfd88ac4 - modified coding style in raster plugin 2011-10-23 16:31:25 +02:00
kunitoki
76cadccd6b - modified coding style in raster plugin 2011-10-23 16:31:25 +02:00
kunitoki
05a32a18e5 - aligned coding style in osm plugin 2011-10-22 16:04:05 +02:00
kunitoki
8b53f78d1d - aligned coding style in osm plugin 2011-10-22 16:04:05 +02:00
kunitoki
2a4fe24ea9 - modified coding style in shape plugin 2011-10-22 15:27:28 +02:00
kunitoki
a7b67566b2 - modified coding style in shape plugin 2011-10-22 15:27:28 +02:00
kunitoki
c0273234b6 - aligned coding style in sqlite plugin 2011-10-22 14:50:24 +02:00
kunitoki
b779e406d0 - aligned coding style in sqlite plugin 2011-10-22 14:50:24 +02:00
kunitoki
f1460b78cd - fix indentation and trailing spaces (generally coding style) in rasterlite plugin partially related to #911 2011-10-22 14:29:54 +02:00
kunitoki
b03f0fc226 - fix indentation and trailing spaces (generally coding style) in rasterlite plugin partially related to #911 2011-10-22 14:29:54 +02:00
kunitoki
86d2f9ef19 - removed a refuse of the past in ogr plugin 2011-10-22 14:29:08 +02:00
kunitoki
d67de4ab4a - removed a refuse of the past in ogr plugin 2011-10-22 14:29:08 +02:00
kunitoki
8333b51439 - removed a refuse of the past in occi plugin 2011-10-22 14:28:41 +02:00
kunitoki
41bb8fd38c - removed a refuse of the past in occi plugin 2011-10-22 14:28:41 +02:00
kunitoki
2045506a3d - removed a refuse of the past in kismet plugin 2011-10-22 14:28:07 +02:00
kunitoki
3341b7b7d2 - removed a refuse of the past in kismet plugin 2011-10-22 14:28:07 +02:00
kunitoki
abea816e42 - removed a refuse of the past in gdal plugin 2011-10-22 14:27:21 +02:00
kunitoki
ce5acb94b4 - removed a refuse of the past in gdal plugin 2011-10-22 14:27:21 +02:00
kunitoki
26fbcb51ef - fix indentation and trailing spaces (generally coding style) in occi plugin partially related to #911 2011-10-22 03:33:03 +02:00
kunitoki
0427a9b054 - fix indentation and trailing spaces (generally coding style) in occi plugin partially related to #911 2011-10-22 03:33:03 +02:00
kunitoki
35739ae917 - fix indentation and trailing spaces (generally coding style) in kismet plugin partially related to #911
- implemented srs datasource option in kismet plugin (was hardcoded and not changeable)
2011-10-22 03:10:45 +02:00
kunitoki
1270076460 - fix indentation and trailing spaces (generally coding style) in kismet plugin partially related to #911
- implemented srs datasource option in kismet plugin (was hardcoded and not changeable)
2011-10-22 03:10:45 +02:00
kunitoki
f1c73645cf - fix indentation and trailing spaces (generally coding style) in gdal plugin partially related to #911 2011-10-22 02:46:29 +02:00
kunitoki
3d0de64051 - fix indentation and trailing spaces (generally coding style) in gdal plugin partially related to #911 2011-10-22 02:46:29 +02:00
kunitoki
13df914d06 - fix indentation and trailing spaces (generally coding style) in ogr plugin partially related to #911 2011-10-22 02:27:06 +02:00
kunitoki
10d35add23 - fix indentation and trailing spaces (generally coding style) in ogr plugin partially related to #911 2011-10-22 02:27:06 +02:00
Artem Pavlenko
664d3c4ca6 Merge pull request #910 from MapQuest/multi-tile-policy
Added a 'multi' tiled raster plugin reader for virtual images
2011-10-21 12:26:44 -07:00
Artem Pavlenko
4e22542bce Merge pull request #910 from MapQuest/multi-tile-policy
Added a 'multi' tiled raster plugin reader for virtual images
2011-10-21 12:26:44 -07:00
Dane Springmeyer
bc18b60e1c sqlite: use boost::trim for dequoting of std::string 2011-10-21 03:41:20 -07:00
Dane Springmeyer
5e25e7cd6c sqlite: use boost::trim for dequoting of std::string 2011-10-21 03:41:20 -07:00
Dane Springmeyer
6a9da44c79 sqlite: restore original sqlite dequoting function as the previous simplification did not work 2011-10-21 01:55:07 -07:00
Dane Springmeyer
39e1588f12 sqlite: restore original sqlite dequoting function as the previous simplification did not work 2011-10-21 01:55:07 -07:00
kunitoki
9438ee0fdd - avoid using temporary pointer in sqlite blob/text resultsets 2011-10-19 13:25:08 +02:00
kunitoki
f9c65b8a91 - avoid using temporary pointer in sqlite blob/text resultsets 2011-10-19 13:25:08 +02:00
kunitoki
b7af62acfe - cleaned up readability of occi featureset by using named const variables 2011-10-19 13:23:22 +02:00
kunitoki
0de5fdf622 - cleaned up readability of occi featureset by using named const variables 2011-10-19 13:23:22 +02:00
Dane Springmeyer
6de1e75390 csv plugin: also detect lat/lon/long field names as likely geometry columns 2011-10-18 19:27:23 -07:00
Dane Springmeyer
90154e0a1a csv plugin: also detect lat/lon/long field names as likely geometry columns 2011-10-18 19:27:23 -07:00
Dane Springmeyer
2e4deb1a09 csv plugin: fix newlines detectio, fix first feature detection, and work around spirit number parsing issues 2011-10-18 18:21:19 -07:00
Dane Springmeyer
0cd3048e60 csv plugin: fix newlines detectio, fix first feature detection, and work around spirit number parsing issues 2011-10-18 18:21:19 -07:00
kunitoki
289b8daed0 - favour speed for already specified keys 2011-10-19 00:44:20 +02:00
kunitoki
3e60fa2d5a - favour speed for already specified keys 2011-10-19 00:44:20 +02:00
kunitoki
9f227b2dd4 - fixed nose tests on attachdb (still this code seems a bit messy?) 2011-10-19 00:42:49 +02:00
kunitoki
8383603703 - fixed nose tests on attachdb (still this code seems a bit messy?) 2011-10-19 00:42:49 +02:00
kunitoki
ee6a0d9dba - improved automatic determination of key_field from pragma table_info.
- avoid using rowid if we don't have a primary key
2011-10-18 23:51:01 +02:00
kunitoki
ba6e6d9c31 - improved automatic determination of key_field from pragma table_info.
- avoid using rowid if we don't have a primary key
2011-10-18 23:51:01 +02:00
kunitoki
1aa96ace1c - added some comments to clear that using rowid as default key_field for sqlite is *EXTREMELY* dangerous (aka no primary key, unexpected results may appear)
- more cosmetics in sqlite plugin
- refactor unquote function to be lighter and simpler
2011-10-18 23:32:25 +02:00
kunitoki
5d72d50f74 - added some comments to clear that using rowid as default key_field for sqlite is *EXTREMELY* dangerous (aka no primary key, unexpected results may appear)
- more cosmetics in sqlite plugin
- refactor unquote function to be lighter and simpler
2011-10-18 23:32:25 +02:00
kunitoki
020f870bb7 - fixed a problem in automatic sqlite wkb format determination code
- other cosmetics in sqlite datasource
2011-10-18 22:53:47 +02:00
kunitoki
8b9d05db0a - fixed a problem in automatic sqlite wkb format determination code
- other cosmetics in sqlite datasource
2011-10-18 22:53:47 +02:00
kunitoki
2372a60ff7 - cosmetics changes to sqlite datasource plugin
- added initial wkbAuto to auto determine WKB type in sqlite
2011-10-18 22:19:03 +02:00
kunitoki
b23697e1b3 - cosmetics changes to sqlite datasource plugin
- added initial wkbAuto to auto determine WKB type in sqlite
2011-10-18 22:19:03 +02:00
Matt Amos
20ca69c3ea Added Python test for multi-tile raster policy. 2011-10-18 14:34:58 +01:00