From 97f050fb168c4861cdfc4cb268f67f939dde42f2 Mon Sep 17 00:00:00 2001
From: john30 <ebusd@johnm.de>
Date: Sun, 23 Nov 2014 14:40:18 +0100
Subject: [PATCH] introduced DataFieldTemplates,a dded missing type HTI,
 switched to UTF8 encoding

---
 src/lib/ebus/test/test_data.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/lib/ebus/test/test_data.cpp b/src/lib/ebus/test/test_data.cpp
index 0591bf6b..efb0f081 100644
--- a/src/lib/ebus/test/test_data.cpp
+++ b/src/lib/ebus/test/test_data.cpp
@@ -68,6 +68,7 @@ int main()
 		{"x;;bti",   "00:00:00",  "10fe070003000000",   "00", ""},
 		{"x;;bti",   "23:59:59",  "10fe070003595923",   "00", ""},
 		{"x;;bti",   "",          "10fe070003605923",   "00", "rw"},
+		{"x;;hti",   "21:04:58",  "10fe07000315043a",   "00", ""},
 		{"x;;htm", "21:04", "10fe0700021504", "00", ""},
 		{"x;;htm", "00:00", "10fe0700020000", "00", ""},
 		{"x;;htm", "23:59", "10fe070002173b", "00", ""},
@@ -165,7 +166,7 @@ int main()
 		{"x;;bi3:2;0=off,1=on","off","10feffff0100", "00", ""},
 		{"x;;uch;1=test,2=high,3=off,4=on","on","10feffff0104", "00", ""},
 		{"x;s;uch","3","1050ffff00", "0103", ""},
-		{"x;;d2b;;°C;Aussentemperatur","x=18.004 °C [Aussentemperatur]","10fe0700090112", "00", "v"},
+		{"x;;d2b;;�C;Aussentemperatur","x=18.004 �C [Aussentemperatur]","10fe0700090112", "00", "v"},
 		{"x;;bti;;;;y;;bda;;;;z;;bdy", "21:04:58;26.10.2014;Sun","10fe0700085804212610061406", "00", ""}, // combination
 		{"x;;bi3;;;;y;;bi5", "1;-",            "10feffff0108", "00", ""}, // bit combination
 		{"x;;bi3;;;;y;;bi5", "1;1",            "10feffff0128", "00", ""}, // bit combination
@@ -173,7 +174,7 @@ int main()
 		{"x;;bi3;;;;y;;bi5", "-;-",            "10feffff0100", "00", ""}, // bit combination
 		{"x;;bi3;;;;y;;bi7;;;;t;;uch", "-;-;9","10feffff020009", "00", ""}, // bit combination
 		{"x;;bi6:2;;;;y;;bi0:2;;;;t;;uch", "2;1;9","10feffff03800109", "00", ""}, // bit combination
-		{"temp;;d2b;;°C;Aussentemperatur","","", "", "t"}, // template with relative pos
+		{"temp;;d2b;;�C;Aussentemperatur","","", "", "t"}, // template with relative pos
 		{"x;;temp","18.004","10fe0700020112", "00", ""}, // reference to template
 		{"relrel;;d2b;;;;y;;d1c","","", "", "t"},   // template struct with relative pos
 		{"x;;relrel","18.004;9.5","10fe070003011213", "00", ""}, // reference to template struct
@@ -181,7 +182,7 @@ int main()
 		{"x;;trelrel","18.004;19.008","10fe07000401120213", "00", ""}, // reference to template struct
 		{"x;;temp;;;;y;;d1c","18.004;9.5","10fe070003011213", "00", ""}, // reference to template, normal def
 	};
-	map<string, DataField*> templates;
+	DataFieldTemplates* templates = new DataFieldTemplates();
 	DataField* fields = NULL;
 	for (size_t i = 0; i < sizeof(checks) / sizeof(checks[0]); i++) {
 		string check[5] = checks[i];
@@ -233,14 +234,13 @@ int main()
 		if (isTemplate) {
 			// store new template
 			string name = fields->getName();
-			map<string, DataField*>::iterator current = templates.find(name);
-			if (current == templates.end()) {
-				templates[name] = fields;
-			} else {
-				delete current->second;
-				current->second = fields;
+			result = templates->add(fields, true);
+			if (result == RESULT_OK) {
+				fields = NULL;
+				cout << "  store template OK" << endl;
 			}
-			fields = NULL;
+			else
+				cout << "  store template error: " << getResultCode(result) << endl;
 			continue;
 		}
 
@@ -288,8 +288,7 @@ int main()
 		fields = NULL;
 	}
 
-	for (map<string, DataField*>::iterator it = templates.begin(); it != templates.end(); it++)
-		delete it->second;
+	delete templates;
 
 	return 0;