Dane Springmeyer
89db790dda
rename parse_csv function to avoid confusion in inheritance
2016-03-11 14:23:16 -08:00
artemp
1b207ae274
csv_util - move implementation details to .cpp
2016-03-11 16:49:26 +01:00
artemp
609fab5ab1
windows - MAPNIK_DECL csv_file_parser
2016-03-09 14:27:47 +01:00
artemp
bde9e61e21
split csv_line_grammar into *.hpp *_impl.hpp ref #3343
2016-03-09 12:26:07 +01:00
Mickey Rose
c21778fdfc
merge mapnik-index::process_csv_file and csv_datasource::parse_csv
...
- the function in plugin was already configurable via flags, and only
contained two un-conditioned blocks that process_csv_file didn't have
- so I extracted the common parts into a separate function (in a class
holding the flags and state), process_csv_file calls it with default
flags, plugin sets them from params
- removed namespace ::detail, moving stuff that was used outside
csv_utils to ::csv_utils, and the rest to ::csv_utils::detail
2016-02-26 20:28:42 +01:00
Dane Springmeyer
08d7bf2152
no need for template usage for autodect_csv_flavour
2016-02-24 22:24:24 -08:00
Dane Springmeyer
f2782d0b67
[csv] move spirit usage to cpp
2016-02-24 17:42:51 -08:00
Dane Springmeyer
8ffee05048
Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile
2016-02-24 16:42:23 -08:00
artemp
9fe049d8af
CSV utils - strengthen quote detection logic + tests
2016-02-19 15:05:15 +01:00
artemp
cd5105785a
csv_utils - fix istringstream initialiser by using explicit iterators pair std::string ctor
2016-02-18 11:35:14 +01:00
artemp
15f905b272
csv - improved quote auto-detection logic which should catch more corner cases
2016-02-16 16:05:12 +01:00
Dane Springmeyer
85d4596769
move getline impl to separate header to avoid as much spirit inclusion
2016-02-15 19:06:11 -08:00
Mickey Rose
5d1fd56cef
csv_grammar: make csv_white_space_skipper a primitive_parser
2016-02-15 15:17:26 +01:00
artemp
ca0c0e5888
csv_util - combine auto-decting separator/quote/newline into one method std::tuple<char, bool, char, char> autodect_csv_flavour(T & stream, std::size_t file_length)
2016-02-15 13:55:06 +01:00
Dane Springmeyer
e76a1d9a81
[csv] use faster version of csv_utils::parse_line in more places + fix error output
2016-02-01 12:23:26 -08:00
Jiri Drbalek
7283b758a0
csv.input: fix warning
2015-11-23 08:54:13 +00:00
artemp
58998f8126
cleanup - remove unused vars
2015-11-20 17:45:10 +00:00
artemp
1eab1a3a28
CSV - change 'quote' auto-dection logic to handle mixed cases better
2015-11-20 17:10:55 +00:00
Dane Springmeyer
7608040906
centralize warning suppression
2015-11-07 17:53:09 -08:00
Dane Springmeyer
35dccd4653
remove unused variable [skip ci]
2015-10-23 12:05:56 -07:00
artemp
158729ffa4
remove unreachable code block
2015-10-23 14:24:08 +01:00
artemp
aeaadd423d
geojson.input - print line number
2015-10-22 18:32:23 +01:00
Dane Springmeyer
ca63ae0a96
csv: no need for newlines in exception strings
2015-10-22 10:22:58 -07:00
Dane Springmeyer
ab88fe48a4
csv: fixup error messages when geometry fails to parse
2015-10-22 10:10:23 -07:00
artemp
6effbedff3
csv.input/mapnik-index - validate geometry locator and throw early if invalid
2015-10-22 13:29:26 +01:00
Dane Springmeyer
a7e7f088a2
CSV plugin: trigger exception rather than crash when indexing error happens
2015-10-21 12:54:03 -07:00
Dane Springmeyer
8813e73cfc
rename SHAPE_MEMORY_MAPPED_FILE to MAPNIK_MEMORY_MAPPED_FILE
2015-10-16 13:34:53 -07:00
artemp
b5fe23ac28
inline extract_geometry
2015-10-09 11:26:10 +01:00
artemp
b275bcb2c2
update to use latest grammar + use std:: qualifier for 'C' lib functions
2015-10-07 12:34:20 +01:00
artemp
e727fb3877
csv.input - read first line of data to update descriptor (disk-index) + remove stderr
...
§
2015-10-06 16:39:21 +01:00
artemp
d0cf7ad6f4
csv.input - implement get_geometry_type_impl for disk based index
2015-10-06 11:32:21 +01:00
artemp
2c8ad910d7
csv.input - remove redundant trim_copy
2015-10-06 10:00:42 +01:00
artemp
63c73b5057
add initial 'qoute' auto-detection + restore csv_test's
2015-10-05 16:56:33 +01:00
artemp
5c6c8ff7a3
csv.input - restore handling of inline headers and only one line of data without new line
2015-10-05 15:28:57 +01:00
artemp
178e39e19a
make separator single character and simplify/optimise csv_grammar
2015-10-05 15:23:20 +01:00
artemp
1bccca9ff8
Merge remote-tracking branch 'origin/master'
...
Conflicts:
plugins/input/csv/csv_datasource.cpp
2015-10-02 12:27:28 +01:00
artemp
1d320b7133
make quote single char
2015-10-02 12:20:54 +01:00
artemp
98ea1c5cd9
csv_utils::getline_csv - add 'quote' argument
2015-10-02 12:17:38 +01:00
Dane Springmeyer
336170c13c
avoid excessive calling of std::ios::widen - refs #3101
2015-10-01 15:34:00 -07:00
Dane Springmeyer
3932cc51b3
add getline benchmark - refs #3101
2015-10-01 14:47:55 -07:00
Dane Springmeyer
2d59fca9f9
ensure consistent, ordered linking for plugins - closes #3105
2015-10-01 13:35:56 -07:00
Dane Springmeyer
05ade151a5
suppress yet more -Wshadow warnings from boost
2015-10-01 13:35:23 -07:00
Dane Springmeyer
3acec350f6
avoid more -Wshadow warnings from boost
2015-10-01 13:35:23 -07:00
artemp
be437eb6b0
add experimental getline_csv implementation which handles newline characters inside single/double quoted strings
2015-10-01 18:33:32 +01:00
artemp
a4e15b5a47
remove stderr
2015-10-01 15:34:49 +01:00
artemp
4273e37278
Merge branch 'master' into csv-disk-index
2015-10-01 15:26:47 +01:00
Dane Springmeyer
d6b60188e8
avoid -Wshadow errors from boost when compiling csv plugin
2015-09-30 14:11:16 -07:00
artemp
19897a3085
correct exception handling in main processing loop
2015-09-30 12:37:36 +01:00
artemp
848098baeb
spatial_index/quad_tree - remove `operator>>' requirement, instead value_type stored must have standard layout for correct (de)serialisation + update unit test
2015-09-29 15:44:57 +01:00
artemp
49266fbd56
csv.input (disk-index) - add support for memory mapped files
2015-09-29 10:35:36 +01:00
