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.h | 1
RtspFace/demo/src/test.cpp | 3 +
RtspFace/demo/src/DBuntil.cpp | 56 +++++++++++++++------------
RtspFace/demo/src/DBuntil.h | 5 +-
RtspFace/demo/src/tools.cpp | 16 ++++---
5 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/RtspFace/demo/src/DBuntil.cpp b/RtspFace/demo/src/DBuntil.cpp
index 1c61e1a..5aa8e5b 100644
--- a/RtspFace/demo/src/DBuntil.cpp
+++ b/RtspFace/demo/src/DBuntil.cpp
@@ -3,29 +3,8 @@
#include <cstdio>
#include <iostream>
-DBuntil::DBuntil() {
-
-}
-
-DBuntil::DBuntil(my_db mydb)
+DBuntil::DBuntil()
{
- std::cout<<"DBuntil(my_db mydb) start"<<std::endl;
-
- if(mysql_init(&myCont)!=NULL)
- {
- std::cout<<"init succeed"<<std::endl;
- }
- else
- std::cout<<"init failed"<<std::endl;
-
- if(mysql_real_connect(&myCont, mydb.host, mydb.user, mydb.pswd, mydb.db, mydb.port, NULL, 0) != NULL)
- {
- std::cout<<"mysql_real_connect succeed"<<std::endl;
- }
- else
- std::cout<<"mysql_real_connect failed"<<std::endl;
-
- std::cout<<"DBuntil(my_db mydb) end"<<std::endl;
}
DBuntil::~DBuntil()
@@ -36,12 +15,37 @@
mysql_close(&myCont);
}
+bool DBuntil::db_init(my_db mydb)
+{
+ std::cout<<"db_init(my_db mydb) start"<<std::endl;
+
+ if(mysql_init(&myCont)!=NULL)
+ {
+ std::cout<<"init succeed"<<std::endl;
+ }
+ else
+ std::cout<<"init failed"<<std::endl;
+
+ if(mysql_real_connect(&myCont, mydb.host, mydb.user, mydb.pswd, mydb.db, mydb.port, NULL, 0) != NULL)
+ {
+ std::cout<<"mysql_real_connect succeed"<<std::endl;
+ std::cout<<"db_init(my_db mydb) end"<<std::endl;
+ return true;
+ }
+ else
+ {
+ std::cout<<"mysql_real_connect failed"<<std::endl;
+ }
+ std::cout<<"db_init(my_db mydb) end"<<std::endl;
+ return false;
+}
+
bool DBuntil::db_search(person* per)
{
std::cout<<"db_search start"<<std::endl;
+ //db_init()
if(db_select(per))
{
-
return true;
}
return false;
@@ -58,7 +62,8 @@
if(!mysql_query(&myCont, "SET NAMES utf8"))//璁剧疆缂栫爜鏍煎紡
{
std::cout<<"SET NAMES utf8"<<std::endl;
- }else
+ }
+ else
std::cout<<"SET NAMES utf8 failed"<<std::endl;
res = mysql_query(&myCont,sql);//鏌ヨ
if (!res)
@@ -76,7 +81,8 @@
std::cout<<"per->name="<<per->name<<std::endl;
std::cout<<"per->f_id="<<per->f_id<<std::endl;
}
- }else
+ }
+ else
std::cout<<"result is null?"<<std::endl;
}
else
diff --git a/RtspFace/demo/src/DBuntil.h b/RtspFace/demo/src/DBuntil.h
index 9585724..c335bb6 100644
--- a/RtspFace/demo/src/DBuntil.h
+++ b/RtspFace/demo/src/DBuntil.h
@@ -23,12 +23,12 @@
public:
DBuntil();
- DBuntil(my_db mydb);
~DBuntil();
bool db_search(person *p);
bool db_register(person *p);
-
+ bool db_init(my_db mydb);
+
MYSQL myCont;
MYSQL_RES *result;
MYSQL_ROW sql_row;
@@ -37,7 +37,6 @@
bool db_add(person *per);
int db_update();
bool db_select(person *per);
-
char sql[1024];
int res;
diff --git a/RtspFace/demo/src/test.cpp b/RtspFace/demo/src/test.cpp
index af8c4b1..e71513b 100644
--- a/RtspFace/demo/src/test.cpp
+++ b/RtspFace/demo/src/test.cpp
@@ -27,7 +27,8 @@
int idx = -11;
tools tool=tools();
- cout<<"======tools==========="<<endl;
+ tool.init();
+ cout<<"======tools init ==========="<<endl;
//idx=tool.reg(bgr_image,&p);
tool.search(bgr_image,&p);
cout<<"============================================"<<endl;
diff --git a/RtspFace/demo/src/tools.cpp b/RtspFace/demo/src/tools.cpp
index 7fb3e33..ad8166d 100644
--- a/RtspFace/demo/src/tools.cpp
+++ b/RtspFace/demo/src/tools.cpp
@@ -2,14 +2,15 @@
tools::tools()
{
- std::cout<<"tools() start"<<std::endl;
- my_db mydb= {"root","Basic@2017","localhost","demo",3306};
-
- dbu = DBuntil(mydb);
- std::cout<<"tools() end"<<std::endl;
}
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)
{
@@ -30,7 +31,7 @@
int tools::search(char* s_feature,person *p)
{
- p={};
+ p= {};
p->f_id = f_api.do_reasch(s_feature);
if(p->f_id > 0)
{
@@ -56,6 +57,7 @@
//if(dbu.myCont == NULL){
// std::cout<<"myCont is null"<<std::endl;
//}
+
dbu.db_search(p);
if(p->p_id != NULL)
{
@@ -66,7 +68,7 @@
int tools::do_register(cv::Mat image,person *p)
{
- p={};
+ p= {};
p->f_id = f_api.do_register(image);
if(p->f_id > 0)
{
diff --git a/RtspFace/demo/src/tools.h b/RtspFace/demo/src/tools.h
index 1d263aa..d9c65f6 100644
--- a/RtspFace/demo/src/tools.h
+++ b/RtspFace/demo/src/tools.h
@@ -13,6 +13,7 @@
int search(char* s_feature,person *p);
int reg(cv::Mat image,person *p);
+ bool init();
private:
int do_register(cv::Mat image,person *p);
int do_search(person *p);
--
Gitblit v1.8.0