From 7002c58acbe6e1470b6e15adea573f938663ff03 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 04 一月 2017 17:03:03 +0800
Subject: [PATCH] 

---
 RtspFace/demo/src/tools.cpp |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/RtspFace/demo/src/tools.cpp b/RtspFace/demo/src/tools.cpp
index b64f807..ac85d55 100644
--- a/RtspFace/demo/src/tools.cpp
+++ b/RtspFace/demo/src/tools.cpp
@@ -1,15 +1,19 @@
 #include "tools.h"
 
-tools::tools() {}
+tools::tools() {
+	my_db mydb={"root","Basic@2017","localhost","demo",3306};
+	
+	dbu = DBuntil(mydb);
+}
 
 tools::~tools() {}
 
 int tools::search(cv::Mat image,person *p)
 {
-	idx = f_api->do_reasch(image);
+	idx = f_api.do_reasch(image);
 	if(idx<0)
 	{
-		p = f_db->db_rearch(int);
+		p = dbu.db_rearch(idx);
 		if(p != NULL)
 		{
 			return 0;
@@ -20,10 +24,10 @@
 
 int tools::search(char* s_feature,person *p)
 {
-	idx = f_api->do_reasch(s_feature);
+	idx = f_api.do_reasch(s_feature);
 	if(idx<0)
 	{
-		p = db_rearch(int);
+		p = dbu.db_rearch(idx);
 		if(p != NULL)
 		{
 			return 0;
@@ -32,25 +36,28 @@
 	return -1;
 }
 
-int tools::register(cv::Mat image,person *p)
+int tools::reg(cv::Mat image,person *p)
 {
-	do_register(image,p);
+	if(do_register(image,p) == 0){
+		return 0;
+	}
+	return -1;
 }
 
 person tools::do_search(int idx)
 {
 	person p;
-	p = f_db->db_rearch(int);
+	p = dbu.db_rearch(idx);
 	return p;
 }
 
 int tools::do_register(cv::Mat image,person *p)
 {
-	idx = f_api->do_register(image);
+	idx = f_api.do_register(image);
 	if(idx<0)
 	{
-		idx = f_db->do_register(idx,p);
-		if(idx)
+		p->f_id = idx;
+		if(dbu.db_register(idx,p))
 		{
 			return 0;
 		}

--
Gitblit v1.8.0