Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / plugins / store / postgresql / postgresql_store.h

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.h b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
index edba035927bac2e9dbdb7c0cd340898bea46ddf5..4585bbdf30146adba3247cc778f6c7a375d44501 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
@@ -33,15 +33,13 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include <map>

 
 #include "stg/store.h"
 
 #include "stg/store.h"

+#include "stg/logger.h"

 
 

-// Minimal DB version is 5
-// Recommended DB version is 6 (support FreeMb logging on disconnects)
-#define DB_MIN_VERSION 5
-
-extern "C" STORE * GetStore();
+// Minimal DB version is 7
+// Recommended DB version is 7 (support full month stats)
+#define DB_MIN_VERSION 7

 
 class POSTGRESQL_STORE : public STORE {
 public:
 
 class POSTGRESQL_STORE : public STORE {
 public:


@@ -96,7 +94,7 @@ public:
     // Tariffs
     int GetTariffsList(std::vector<std::string> * tariffsList) const;
     int AddTariff(const std::string & name) const;
     // Tariffs
     int GetTariffsList(std::vector<std::string> * 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;
 
     int SaveTariff(const TARIFF_DATA & td, const std::string & tariffName) const;
     int RestoreTariff(TARIFF_DATA * td, const std::string & tariffName) const;
 


@@ -115,11 +113,11 @@ public:
     int DelService(const std::string & name) const;
 
     // Settings
     int DelService(const std::string & name) const;
 
     // Settings

-    inline void SetSettings(const MODULE_SETTINGS & s) { settings = s; };
+    inline void SetSettings(const MODULE_SETTINGS & s) { settings = s; }

     int ParseSettings();
 
     int ParseSettings();
 

-    inline const string & GetStrError() const { return strError; };
-    inline const string & GetVersion() const { return versionString; };
+    inline const std::string & GetStrError() const { return strError; }
+    inline const std::string & GetVersion() const { return versionString; }

 private:
     POSTGRESQL_STORE(const POSTGRESQL_STORE & rvalue);
     POSTGRESQL_STORE & operator=(const POSTGRESQL_STORE & rvalue);
 private:
     POSTGRESQL_STORE(const POSTGRESQL_STORE & rvalue);
     POSTGRESQL_STORE & operator=(const POSTGRESQL_STORE & rvalue);


@@ -130,8 +128,8 @@ private:
 
     int EscapeString(std::string & value) const;
 
 
     int EscapeString(std::string & value) const;
 

-    std::string Int2TS(uint32_t value) const;
-    uint32_t TS2Int(const std::string & value) const;
+    std::string Int2TS(time_t value) const;
+    time_t TS2Int(const std::string & value) const;

 
     int SaveStat(const USER_STAT & stat, const std::string & login, int year = 0, int month = 0) const;
 
 
     int SaveStat(const USER_STAT & stat, const std::string & login, int year = 0, int month = 0) const;
 


@@ -158,8 +156,8 @@ private:
     int retries;
 
     PGconn * connection;
     int retries;
 
     PGconn * connection;

-};

 
 

-extern const volatile time_t stgTime;
+    PLUGIN_LOGGER logger;
+};

 
 #endif //POSTGRESQL_STORE_H
 
 #endif //POSTGRESQL_STORE_H