X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9ad8644e6bfafa45a5fbca4c357da13454746a49..66c4165457f76e06ce6716a42dd4c8495af916db:/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp index c36df0cd..ef705053 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp @@ -26,13 +26,16 @@ * */ +#include "postgresql_store.h" + +#include "stg/common.h" + #include #include #include -#include "stg/common.h" -#include "postgresql_store.h" +extern volatile time_t stgTime; int POSTGRESQL_STORE::StartTransaction() const { @@ -91,10 +94,10 @@ int error = 0; char * buf = new char[(value.length() << 1) + 1]; PQescapeStringConn(connection, - buf, - value.c_str(), - value.length(), - &error); + buf, + value.c_str(), + value.length(), + &error); if (error) { @@ -110,24 +113,23 @@ delete[] buf; return 0; } -std::string POSTGRESQL_STORE::Int2TS(uint32_t ts) const +std::string POSTGRESQL_STORE::Int2TS(time_t ts) const { -char buf[32]; struct tm brokenTime; -time_t tt = ts; brokenTime.tm_wday = 0; brokenTime.tm_yday = 0; brokenTime.tm_isdst = 0; -gmtime_r(&tt, &brokenTime); +gmtime_r(&ts, &brokenTime); +char buf[32]; strftime(buf, 32, "%Y-%m-%d %H:%M:%S", &brokenTime); return buf; } -uint32_t POSTGRESQL_STORE::TS2Int(const std::string & ts) const +time_t POSTGRESQL_STORE::TS2Int(const std::string & ts) const { struct tm brokenTime; @@ -159,8 +161,6 @@ if (year) else { time_t curTime = stgTime; - /*time(&curTime);*/ - localtime_r(&curTime, &brokenTime); } @@ -172,4 +172,3 @@ strftime(buf, 32, "%Y-%m-%d", &brokenTime); date = buf; } -