From 13ab3d6db66bef485afda3278ed7ca6d14c735c8 Mon Sep 17 00:00:00 2001
From: pans <pans@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期四, 05 一月 2017 16:56:46 +0800
Subject: [PATCH] 

---
 RtspFace/demo/src/tools.cpp |   60 +++++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/RtspFace/demo/src/tools.cpp b/RtspFace/demo/src/tools.cpp
index b64f807..ad8166d 100644
--- a/RtspFace/demo/src/tools.cpp
+++ b/RtspFace/demo/src/tools.cpp
@@ -1,16 +1,27 @@
 #include "tools.h"
 
-tools::tools() {}
+tools::tools()
+{
+}
 
 tools::~tools() {}
 
+bool tools::init(){
+	my_db mydb= {"root","Basic@2017","localhost","demo",3306};
+	//DBuntil dbu =DBuntil();
+	return dbu.db_init(mydb);
+}
+
 int tools::search(cv::Mat image,person *p)
 {
-	idx = f_api->do_reasch(image);
-	if(idx<0)
+	//p={};
+	int temp = f_api.do_reasch(image);
+	std::cout<<"temp="<<temp<<std::endl;
+	p->f_id = temp;
+	std::cout<<"p->f_id"<<p->f_id<<std::endl;
+	if(p->f_id > 0)
 	{
-		p = f_db->db_rearch(int);
-		if(p != NULL)
+		if(do_search(p) == 0)
 		{
 			return 0;
 		}
@@ -20,11 +31,11 @@
 
 int tools::search(char* s_feature,person *p)
 {
-	idx = f_api->do_reasch(s_feature);
-	if(idx<0)
+	p= {};
+	p->f_id = f_api.do_reasch(s_feature);
+	if(p->f_id > 0)
 	{
-		p = db_rearch(int);
-		if(p != NULL)
+		if(do_search(p) == 0)
 		{
 			return 0;
 		}
@@ -32,25 +43,36 @@
 	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)
+int tools::do_search(person *p)
 {
-	person p;
-	p = f_db->db_rearch(int);
-	return p;
+	//if(dbu.myCont == NULL){
+	//	std::cout<<"myCont is null"<<std::endl;
+	//}
+	
+	dbu.db_search(p);
+	if(p->p_id != NULL)
+	{
+		return 0;
+	}
+	return -1;
 }
 
 int tools::do_register(cv::Mat image,person *p)
 {
-	idx = f_api->do_register(image);
-	if(idx<0)
+	p= {};
+	p->f_id = f_api.do_register(image);
+	if(p->f_id > 0)
 	{
-		idx = f_db->do_register(idx,p);
-		if(idx)
+		if(dbu.db_register(p))
 		{
 			return 0;
 		}

--
Gitblit v1.8.0