Improved error checking, updated CSV parser

The CSV-parser update fixes a bug that would've occured with some input files, in particular if they were touched by a third party tool like LibreOffice
SydMontague · Mar 3, 2020 · c88f678 · c88f678
1 parent 53d4125
commit c88f678
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/DSCSTools/EXPA.cpp b/DSCSTools/EXPA.cpp
@@ -350,13 +350,13 @@ void packMBE(boost::filesystem::path source, boost::filesystem::path target) {
 		bool first = true;
 
 		for (auto &row : parser) {
-			if (first) {
-				if (localFormat.size() != row.size()) {
-					std::cout << "Error: structure element count differs from input element count. The wrong structure may be used?" << std::endl;
-					std::cout << "Expected: " << localFormat.size() << " | Found: " << row.size() << std::endl;
-					return;
-				}
+			if (localFormat.size() != row.size()) {
+				std::cout << "Error: structure element count differs from input element count. The wrong structure may be used?" << std::endl;
+				std::cout << "Expected: " << localFormat.size() << " | Found: " << row.size() << std::endl;
+				return;
+			}
 
+			if (first) {
 				first = false;
 				continue;
 			}

diff --git a/libs/csv-parser/parser.hpp b/libs/csv-parser/parser.hpp
@@ -138,7 +138,8 @@ namespace aria {
 							m_cursor++;
 							if (c == m_terminator) {
 								handle_crlf(c);
-								return Field(FieldType::ROW_END);
+								m_state = State::END_OF_ROW;
+								return Field(m_fieldbuf);
 							}
 
 							if (c == m_quote) {