From 2828a3771a044cc3ccb3bfe5eaf8fdda3573ffce Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 25 Jun 2021 13:43:53 +0200
Subject: [PATCH] [A/IO] Refactor CsvInterface::getColumnNames.
---
Applications/FileIO/CsvInterface.cpp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Applications/FileIO/CsvInterface.cpp b/Applications/FileIO/CsvInterface.cpp
index 22076fa613e..5536da166ab 100644
--- a/Applications/FileIO/CsvInterface.cpp
+++ b/Applications/FileIO/CsvInterface.cpp
@@ -30,21 +30,24 @@ std::vector<std::string> CsvInterface::getColumnNames(std::string const& fname,
if (!in.is_open())
{
- ERR("CsvInterface::readPoints(): Could not open file {:s}.", fname);
+ ERR("CsvInterface::getColumnNames(): Could not open file {:s}.", fname);
return std::vector<std::string>();
}
std::string line;
if (!std::getline(in, line))
{
+ ERR("CsvInterface::getColumnNames(): Could not read line from file "
+ "{:s}. Is it empty?",
+ fname);
return {};
}
- std::list<std::string> fields;
- if (delim != '\n')
+ if (delim == '\n')
{
- fields = BaseLib::splitString(line, delim);
+ return {};
}
+ std::list<std::string> fields = BaseLib::splitString(line, delim);
if (fields.size() < 2)
{
for (char const d : {'\t', ';', ','})
--
GitLab