Ticket. InToTraffType() function declaration and definition added.

[stg.git] / 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 55333888e57cccd91ce86804562fbf3326d832f2..688f0e88651da56258aad827b29d4ff92a21c6d7 100644 (file)
--- a/projects/stargazer/plugins/store/firebird/firebird_store.h
+++ b/projects/stargazer/plugins/store/firebird/firebird_store.h
@@ -29,23 +29,20 @@
 #ifndef FIREBIRD_STORE_H
 #define FIREBIRD_STORE_H
 
 #ifndef FIREBIRD_STORE_H
 #define FIREBIRD_STORE_H
 

+#include <ctime>

 #include <string>
 #include <vector>
 #include <string>
 #include <vector>

-#include <map>

 
 

-#include "base_store.h"
-#include "stg_locker.h"
-#include "ibpp.h"
-//#include "firebird_database.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); }
+struct ToLower {
+    char operator() (char c) const  { return static_cast<char>(std::tolower(c)); }

 };
 
 };
 

-extern "C" BASE_STORE * GetStore();
-
-class FIREBIRD_STORE : public BASE_STORE {
+class FIREBIRD_STORE : public STORE {

 public:
     FIREBIRD_STORE();
     virtual ~FIREBIRD_STORE();
 public:
     FIREBIRD_STORE();
     virtual ~FIREBIRD_STORE();


@@ -73,7 +70,7 @@ public:
                             double cash,
                             double freeMb,
                             const std::string & reason) const;
                             double cash,
                             double freeMb,
                             const std::string & reason) const;

-    int WriteDetailedStat(const std::map<IP_DIR_PAIR, STAT_NODE> & statTree,
+    int WriteDetailedStat(const TRAFF_STAT & statTree,

                           time_t lastStat,
                           const std::string & login) const;
 
                           time_t lastStat,
                           const std::string & login) const;
 


@@ -93,7 +90,7 @@ public:
 
     int GetTariffsList(std::vector<std::string> * tariffsList) const;
     int AddTariff(const std::string & name) const;
 
     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;
 


@@ -103,34 +100,40 @@ public:
     int AddCorp(const std::string & name) const;
     int DelCorp(const std::string & name) const;
 
     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();
 
     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<std::string> * 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;
 
     int GetServicesList(std::vector<std::string> * 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:
 private:

+    FIREBIRD_STORE(const FIREBIRD_STORE & rvalue);
+    FIREBIRD_STORE & operator=(const FIREBIRD_STORE & rvalue);
+

     std::string version;
     mutable std::string strError;
     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;
     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;
+    int schemaVersion;
+    PLUGIN_LOGGER logger;

 
     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;

-
-    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;
+    int CheckVersion();

 };
 
 };
 

-#endif //FIREBIRD_STORE_H
+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