X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..68ff250b88c43acf959cdf80eb9c3a519157a3f7:/projects/stargazer/plugins/store/firebird/firebird_store.h diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.h b/projects/stargazer/plugins/store/firebird/firebird_store.h index 45cf4f8d..638067f2 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store.h +++ b/projects/stargazer/plugins/store/firebird/firebird_store.h @@ -32,18 +32,16 @@ #include #include #include -#include -#include "store.h" -#include "stg_locker.h" -#include "ibpp.h" +#include "stg/store.h" +#include "stg/locker.h" +#include "stg/ibpp.h" +#include "stg/logger.h" struct ToLower { - char operator() (char c) const { return std::tolower(c); } + char operator() (char c) const { return static_cast(std::tolower(c)); } }; -extern "C" STORE * GetStore(); - class FIREBIRD_STORE : public STORE { public: FIREBIRD_STORE(); @@ -92,7 +90,7 @@ public: int GetTariffsList(std::vector * tariffsList) const; int AddTariff(const std::string & name) const; - int DelTariff(const string & name) const; + int DelTariff(const std::string & name) const; int SaveTariff(const TARIFF_DATA & td, const std::string & tariffName) const; int RestoreTariff(TARIFF_DATA * td, const std::string & tariffName) const; @@ -102,33 +100,38 @@ public: int AddCorp(const std::string & name) const; int DelCorp(const std::string & name) const; - inline void SetSettings(const MODULE_SETTINGS & s) { settings = s; }; + inline void SetSettings(const MODULE_SETTINGS & s) { settings = s; } int ParseSettings(); - inline const string & GetStrError() const { return strError; }; + inline const std::string & GetStrError() const { return strError; } - inline const string & GetVersion() const { return version; }; + inline const std::string & GetVersion() const { return version; } int GetServicesList(std::vector * servicesList) const; int SaveService(const SERVICE_CONF & sc) const; int RestoreService(SERVICE_CONF * sc, const std::string & name) const; int AddService(const std::string & name) const; int DelService(const std::string & name) const; + private: + FIREBIRD_STORE(const FIREBIRD_STORE & rvalue); + FIREBIRD_STORE & operator=(const FIREBIRD_STORE & rvalue); + std::string version; mutable std::string strError; - mutable std::string db_server, db_database, db_user, db_password; + std::string db_server, db_database, db_user, db_password; MODULE_SETTINGS settings; mutable IBPP::Database db; mutable pthread_mutex_t mutex; - mutable IBPP::TIL til; - mutable IBPP::TLR tlr; + IBPP::TIL til; + IBPP::TLR tlr; + PLUGIN_LOGGER logger; int SaveStat(const USER_STAT & stat, const std::string & login, int year = 0, int month = 0) const; }; -time_t ts2time_t(const IBPP::Timestamp & ts) const; -void time_t2ts(time_t t, IBPP::Timestamp * ts) const; -void ym2date(int year, int month, IBPP::Date * date) const; +time_t ts2time_t(const IBPP::Timestamp & ts); +void time_t2ts(time_t t, IBPP::Timestamp * ts); +void ym2date(int year, int month, IBPP::Date * date); #endif //FIREBIRD_STORE_H