Commit 240d3c8f authored by Claude Brisson's avatar Claude Brisson

bugfix

parent e118bfa7
...@@ -27,7 +27,7 @@ all: timeslice ...@@ -27,7 +27,7 @@ all: timeslice
timeslice: obj/timeslice.o obj/main.o timeslice: obj/timeslice.o obj/main.o
$(CXX) $^ -o $@ $(LDFLAGS) $(CXX) $^ -o $@ $(LDFLAGS)
obj/timeslice.o: src/timeslice.cpp src/timeslice.h obj/timeslice.o: src/timeslice.cpp src/timeslice.h src/config.h
mkdir -p obj mkdir -p obj
$(CXX) $(CXXFLAGS) -o $@ -c $< $(CXX) $(CXXFLAGS) -o $@ -c $<
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
#include <exception> #include <exception>
#include <iostream> #include <iostream>
#include <mysql++/mysql++.h> #include <mysql++/mysql++.h>
#include "config.h"
static TimeSlice *app = nullptr; static TimeSlice *app = nullptr;
...@@ -34,7 +35,7 @@ void TimeSlice::readProjects() ...@@ -34,7 +35,7 @@ void TimeSlice::readProjects()
mysqlpp::Connection conn; mysqlpp::Connection conn;
mysqlpp::SetCharsetNameOption *scno = new mysqlpp::SetCharsetNameOption("utf8"); mysqlpp::SetCharsetNameOption *scno = new mysqlpp::SetCharsetNameOption("utf8");
conn.set_option(scno); conn.set_option(scno);
conn.connect(TS_DB, TS_HOST, TS_TIMESLICE, TS_PASSWORD); conn.connect(TS_DB, TS_HOST, TS_USER, TS_PASSWORD);
mysqlpp::Query query = conn.query(); mysqlpp::Query query = conn.query();
query << "SELECT pr_id, name FROM project ORDER BY name"; query << "SELECT pr_id, name FROM project ORDER BY name";
mysqlpp::StoreQueryResult res = query.store(); mysqlpp::StoreQueryResult res = query.store();
...@@ -134,7 +135,7 @@ void TimeSlice::registerTimeSlice(int id, timestamp start, long elapsed) ...@@ -134,7 +135,7 @@ void TimeSlice::registerTimeSlice(int id, timestamp start, long elapsed)
mysqlpp::Connection conn; mysqlpp::Connection conn;
mysqlpp::SetCharsetNameOption *scno = new mysqlpp::SetCharsetNameOption("utf8"); mysqlpp::SetCharsetNameOption *scno = new mysqlpp::SetCharsetNameOption("utf8");
conn.set_option(scno); conn.set_option(scno);
conn.connect(TS_DB, TS_HOST, TS_TIMESLICE, TS_PASSWORD); conn.connect(TS_DB, TS_HOST, TS_USER, TS_PASSWORD);
mysqlpp::Query query = conn.query(); mysqlpp::Query query = conn.query();
std::time_t time = std::chrono::system_clock::to_time_t(start); std::time_t time = std::chrono::system_clock::to_time_t(start);
std::cerr << "@@@ " << std::put_time(std::localtime(&time), "%F %T") << std::endl; std::cerr << "@@@ " << std::put_time(std::localtime(&time), "%F %T") << std::endl;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment