organicmaps/just_gtfs
13
Fork 0
Code Issues Pull requests 1 Projects Releases Wiki Activity Actions

Fix for csv with different count of fields in header and row

Browse source
This commit is contained in:
Olga Khlopkova 2020-04-30 16:04:08 +03:00
parent b0bc895146
commit 7f6f960ed7
1 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
include/just_gtfs/just_gtfs.h
View file

@ -159,27 +159,21 @@ inline Result CsvParser::read_header(const std::string & csv_filename)
inline Result CsvParser::read_row(std::map<std::string, std::string> & obj)
{
obj = {};
std::string row;
if (!getline(csv_stream, row))
{
obj = {};
return {ResultCode::END_OF_FILE, {}};
}
if (row == "\r")
{
obj = {};
return {ResultCode::OK, {}};
}
std::vector<std::string> fields_values = split_record(row);
const std::vector<std::string> fields_values = split_record(row);
// Different count of fields in row and in the header of csv.
// Typical approach to skip not required fields.
if (fields_values.size() != field_sequence.size())
obj = {};
// Different count of fields in the row and in the header of csv.
// Typical approach is to skip not required fields.
const size_t fields_count = std::min(field_sequence.size(), fields_values.size());
for (size_t i = 0; i < field_sequence.size(); ++i)
for (size_t i = 0; i < fields_count; ++i)
obj[field_sequence[i]] = fields_values[i];
return {ResultCode::OK, {}};