refactor parser factory

1 files changed, 4 insertions, 10 deletions

diff --git a/CSVParser.cpp b/CSVParser.cpp
index 824d5f4..8afce80 100644
--- a/CSVParser.cpp
+++ b/CSVParser.cpp
@@ -6,17 +6,11 @@
 
 #include "CSVParser.h"
 #include "Exception.h"
-#include "ParserFactory.h"
 
 using namespace std;
 
-CSVParser CSVParser::instance {};
-CSVParser::CSVParser() {
-	ParserFactory::register_strategy(this);
-}
-
-unsigned int CSVParser::heuristic(FileReader & f) {
-	const string content = f.read();
+unsigned int CSVParser::heuristic() {
+	const string content = this->get_file().read();
 	int global_columns = 0;
 	int columns = 1;
 	int rows = 0;
@@ -41,10 +35,10 @@ static size_t header_idx(vector<string> header, string field) {
 	return iter - header.begin();
 }
 
-void CSVParser::parse(FileReader & f, MuseumDeserializer & d) {
+void CSVParser::parse(MuseumDeserializer & d) {
 	vector<vector<string>> table = {};
 
-	istringstream rows(f.read());
+	istringstream rows(this->get_file().read());
 	string row;
 	while (getline(rows, row)) {
 		// ignore windows line endings