X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..4a89beb9494451304e34e9a8e226936ac465c536:/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 28a17895..f5dec89f 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp @@ -31,10 +31,11 @@ #include -#include "common.h" - +#include "stg/common.h" #include "postgresql_store.h" +extern volatile time_t stgTime; + int POSTGRESQL_STORE::StartTransaction() const { PGresult * result = PQexec(connection, "BEGIN"); @@ -101,7 +102,7 @@ if (error) { strError = PQerrorMessage(connection); printfd(__FILE__, "POSTGRESQL_STORE::EscapeString(): '%s'\n", strError.c_str()); - delete buf; + delete[] buf; return -1; } @@ -111,24 +112,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); 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;