X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/6738cb36879ef49d635b7214fe0fd43a180f892f..2574a28cbf000603bc31f61593dbf061ff56c1d5:/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp index fd0b38bc..085675c3 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp @@ -26,6 +26,11 @@ * */ +#include "postgresql_store.h" + +#include "stg/tariff_conf.h" +#include "stg/common.h" + #include #include #include @@ -33,10 +38,6 @@ #include -#include "stg/common.h" -#include "postgresql_store.h" -#include "stg/locker.h" - namespace { @@ -47,7 +48,7 @@ const int pt_mega = 1024 * 1024; //----------------------------------------------------------------------------- int POSTGRESQL_STORE::GetTariffsList(std::vector * tariffsList) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (PQstatus(connection) != CONNECTION_OK) { @@ -103,7 +104,7 @@ return 0; //----------------------------------------------------------------------------- int POSTGRESQL_STORE::AddTariff(const std::string & name) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (PQstatus(connection) != CONNECTION_OK) { @@ -166,7 +167,7 @@ return 0; //----------------------------------------------------------------------------- int POSTGRESQL_STORE::DelTariff(const std::string & name) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (PQstatus(connection) != CONNECTION_OK) { @@ -227,10 +228,10 @@ if (CommitTransaction()) return 0; } //----------------------------------------------------------------------------- -int POSTGRESQL_STORE::SaveTariff(const TARIFF_DATA & td, +int POSTGRESQL_STORE::SaveTariff(const STG::TariffData & td, const std::string & tariffName) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (PQstatus(connection) != CONNECTION_OK) { @@ -316,10 +317,10 @@ int32_t id; traff_type = " << td.tariffConf.traffType; if (version > 6) - query << ", period = '" << TARIFF::PeriodToString(td.tariffConf.period) << "'"; + query << ", period = '" << STG::Tariff::toString(td.tariffConf.period) << "'"; if (version > 7) - query << ", change_policy = '" << TARIFF::ChangePolicyToString(td.tariffConf.changePolicy) << "', \ + query << ", change_policy = '" << STG::Tariff::toString(td.tariffConf.changePolicy) << "', \ change_policy_timeout = CAST('" << formatTime(td.tariffConf.changePolicyTimeout) << "' AS TIMESTAMP)"; query << " WHERE pk_tariff = " << id; @@ -412,10 +413,10 @@ if (CommitTransaction()) return 0; } //----------------------------------------------------------------------------- -int POSTGRESQL_STORE::RestoreTariff(TARIFF_DATA * td, - const std::string & tariffName) const +int POSTGRESQL_STORE::RestoreTariff(STG::TariffData * td, + const std::string & tariffName) const { -STG_LOCKER lock(&mutex); +std::lock_guard lock(m_mutex); if (PQstatus(connection) != CONNECTION_OK) { @@ -508,15 +509,17 @@ int id; tuple >> td->tariffConf.fee; tuple >> td->tariffConf.free; tuple >> td->tariffConf.passiveCost; - tuple >> td->tariffConf.traffType; + unsigned traffType; + tuple >> traffType; + td->tariffConf.traffType = static_cast(traffType); } if (version > 6) - td->tariffConf.period = TARIFF::StringToPeriod(PQgetvalue(result, 0, 5)); + td->tariffConf.period = STG::Tariff::parsePeriod(PQgetvalue(result, 0, 5)); if (version > 7) { - td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(PQgetvalue(result, 0, 6)); + td->tariffConf.changePolicy = STG::Tariff::parseChangePolicy(PQgetvalue(result, 0, 6)); td->tariffConf.changePolicyTimeout = readTime(PQgetvalue(result, 0, 7)); } @@ -599,7 +602,7 @@ for (int i = 0; i < std::min(tuples, DIR_NUM); ++i) { td->dirPrice[dir].singlePrice = false; } - if (td->dirPrice[dir].threshold == (int)0xffFFffFF) + if (td->dirPrice[dir].threshold == static_cast(0xffFFffFF)) { td->dirPrice[dir].noDiscount = true; }