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

fix blank line test for require headers.size() == 1 + reduce stderr verbosity.

Browse source
This commit is contained in:
artemp 2017-01-17 17:54:09 +01:00
parent ff4a1c1e9b
commit 8a3a380b3b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/input/csv/csv_utils.cpp
View file

@ -285,7 +285,10 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
{ {
auto headers = csv_utils::parse_line(csv_line, separator_, quote_); auto headers = csv_utils::parse_line(csv_line, separator_, quote_);
// skip blank lines // skip blank lines
if (headers.size() > 0 && headers[0].empty()) ++line_number; if (headers.size() == 1 && headers[0].empty())
{
++line_number;
}
else else
{ {
std::size_t index = 0; std::size_t index = 0;
@ -300,7 +303,7 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
std::ostringstream s; std::ostringstream s;
s << "CSV Plugin: expected a column header at line "; s << "CSV Plugin: expected a column header at line ";
s << line_number << ", column " << index; s << line_number << ", column " << index;
s << " - ensure this row contains valid header fields: '"; s << " - expected fields: '";
s << csv_line; s << csv_line;
throw mapnik::datasource_exception(s.str()); throw mapnik::datasource_exception(s.str());
} }
@ -338,7 +341,6 @@ void csv_file_parser::parse_csv_and_boxes(std::istream & csv_file, T & boxes)
std::string str("CSV Plugin: could not detect column(s) with the name(s) of wkt, geojson, x/y, or "); std::string str("CSV Plugin: could not detect column(s) with the name(s) of wkt, geojson, x/y, or ");
str += "latitude/longitude in:\n"; str += "latitude/longitude in:\n";
str += csv_line; str += csv_line;
str += "\n - this is required for reading geometry data";
throw mapnik::datasource_exception(str); throw mapnik::datasource_exception(str);
} }