From cf3bbb8cf0da9cb64131b44d3f0d75021d3cd076 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 16 Aug 2012 18:20:48 -0700 Subject: [PATCH] csv plugin: be more aggressive about detecting and ignoring blank lines --- plugins/input/csv/csv_datasource.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/plugins/input/csv/csv_datasource.cpp b/plugins/input/csv/csv_datasource.cpp index b10729d3a..884ee1ab7 100644 --- a/plugins/input/csv/csv_datasource.cpp +++ b/plugins/input/csv/csv_datasource.cpp @@ -428,19 +428,16 @@ void csv_datasource::parse_csv(T& stream, break; } - unsigned line_length = csv_line.length(); - // skip blank lines - if (line_length < 5) + unsigned line_length = csv_line.length(); + if (line_length <= 10) { std::string trimmed = csv_line; - boost::trim_if(trimmed,boost::algorithm::is_any_of("\",'\r\n")); + boost::trim_if(trimmed,boost::algorithm::is_any_of("\",'\r\n ")); if (trimmed.empty()) { ++line_number; - MAPNIK_LOG_DEBUG(csv) << "csv_datasource: empty row encountered at line: " << line_number; - continue; } }