sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

csv plugin: only attempt to parse ascii as numbers - closes #2450

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-30 16:30:36 -07:00
parent 9cba3a2036
commit c53bcd99a6
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/input/csv/csv_datasource.cpp
View file

@ -694,10 +694,7 @@ void csv_datasource::parse_csv(T & stream,
desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String)); desc_.add_descriptor(mapnik::attribute_descriptor(fld_name,mapnik::String));
} }
} }
else if ((value[0] >= '0' && value[0] <= '9') || else if (csv_utils::is_likely_number(value))
value[0] == '-' ||
value[0] == '+' ||
value[0] == '.')
{ {
bool has_e = value.find("e") != std::string::npos; bool has_e = value.find("e") != std::string::npos;
if (has_dot || has_e) if (has_dot || has_e)

6
plugins/input/csv/csv_utils.hpp
View file

@ -26,9 +26,15 @@
#include <string> #include <string>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <cstdio>
namespace csv_utils namespace csv_utils
{ {
static inline bool is_likely_number(std::string const& value)
{
return( strspn( value.c_str(), "e-.+0123456789" ) == value.size() );
}
static inline void fix_json_quoting(std::string & csv_line) static inline void fix_json_quoting(std::string & csv_line)
{ {
std::string wrapping_char; std::string wrapping_char;