From ce356164bac0f739fea97b8bee61c066b9f2ae87 Mon Sep 17 00:00:00 2001
From: tomsmeding <hallo@tomsmeding.nl>
Date: Mon, 11 May 2015 21:24:57 +0200
Subject: Add <<debug<< log, clean up some code and let find return a list
 instead of 1 element

---
 enginedata.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'enginedata.cpp')

diff --git a/enginedata.cpp b/enginedata.cpp
index 43a50ce..ecb4c82 100644
--- a/enginedata.cpp
+++ b/enginedata.cpp
@@ -1,5 +1,7 @@
 #include "enginedata.h"
+#include "util.h"
 #include <iostream>
+#include <list>
 #include <cassert>
 
 using namespace std;
@@ -41,24 +43,26 @@ Table::Table(Table &&other):name(move(other.name)),nc(other.nc),header(other.hea
 	other.header=nullptr;
 }
 
-void Table::insert(Row &&row){
+bool Table::insert(Row &&row){
 	string key=serialise(this->header[0],row.items[0]);
-	cerr<<"Inserting into table '"<<this->name<<"' key="<<key<<" row="<<row<<endl;
-	rows.emplace(key,move(row));
+	cerr<<debug<<"Inserting into table '"<<this->name<<"' key="<<key<<" row="<<row<<endl;
+	return rows.emplace(key,move(row)).second;
 }
-void Table::insert(Row &row){
+bool Table::insert(Row &row){
 	string key=serialise(this->header[0],row.items[0]);
-	cerr<<"Inserting into table '"<<this->name<<"' key="<<key<<" row="<<row<<endl;
-	rows.emplace(key,row);
+	cerr<<debug<<"Inserting into table '"<<this->name<<"' key="<<key<<" row="<<row<<endl;
+	return rows.emplace(key,row).second;
 }
 
-Maybe<Row> Table::find(const string &key){
+list<Row> Table::find(const string &key){
 	typedef map<string,Row>::const_iterator cit_t;
 	cit_t end=rows.cend();
+	list<Row> ret;
 	for(cit_t it=rows.cbegin();it!=end;it++){
-		if(serialise(it->second.table->header[0],it->second.items[0])==key)return Maybe<Row>(it->second);
+		if(serialise(it->second.table->header[0],it->second.items[0])==key)
+			ret.emplace_back(it->second);
 	}
-	return Maybe<Row>();
+	return ret;
 }
 
 
-- 
cgit v1.2.3-54-g00ecf