TEST_SETTINGS_LOCAL moved outside the namespace, more assertions added

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / rpcconfig.h

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
index 58e8973a44e4c9d2c7e7ce2a542dcdcbbeebf1b8..da11d46709c54488d405d0f046f01f8b72608e5e 100644 (file)
--- a/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
+++ b/projects/stargazer/plugins/configuration/rpcconfig/rpcconfig.h
@@ -6,14 +6,16 @@
 #include <ctime>
 #include <string>
 #include <map>
 #include <ctime>
 #include <string>
 #include <map>

+#include <vector>

 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 
 
 #include <xmlrpc-c/base.hpp>
 #include <xmlrpc-c/registry.hpp>
 #include <xmlrpc-c/server_abyss.hpp>
 

-#include "os_int.h"
-#include "plugin.h"
-#include "admin_conf.h"
+#include "stg/os_int.h"
+#include "stg/plugin.h"
+#include "stg/admin_conf.h"
+#include "stg/module_settings.h"

 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 
 
 #define RPC_CONFIG_VERSION "Stargazer RPC v. 0.2"
 


@@ -61,7 +63,7 @@ public:
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
     void                SetTraffcounter(TRAFFCOUNTER *) {}
     void                SetAdmins(ADMINS * a) { admins = a; }
     void                SetStore(STORE * s) { store = s; }
     void                SetTraffcounter(TRAFFCOUNTER *) {}

-    void                SetStgSettings(const SETTINGS * s) { stgSettings = s; }
+    void                SetStgSettings(const SETTINGS * s);

     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 
     void                SetSettings(const MODULE_SETTINGS & s) { settings = s; }
     int                 ParseSettings();
 


@@ -70,8 +72,8 @@ public:
     int                 Reload() { return 0; }
     bool                IsRunning() { return running && !stopped; }
 
     int                 Reload() { return 0; }
     bool                IsRunning() { return running && !stopped; }
 

-    const string      & GetStrError() const { return errorStr; }
-    const string        GetVersion() const { return RPC_CONFIG_VERSION; }
+    const std::string & GetStrError() const { return errorStr; }
+    const std::string   GetVersion() const { return RPC_CONFIG_VERSION; }

     uint16_t            GetStartPosition() const { return 220; }
     uint16_t            GetStopPosition() const { return 220; }
 
     uint16_t            GetStartPosition() const { return 220; }
     uint16_t            GetStopPosition() const { return 220; }
 


@@ -87,14 +89,13 @@ private:
     std::string             GetCookie() const;
     void                    InitiateRegistry();
 
     std::string             GetCookie() const;
     void                    InitiateRegistry();
 

-    mutable string          errorStr;
+    mutable std::string     errorStr;

     RPC_CONFIG_SETTINGS     rpcConfigSettings;
     USERS *                 users;
     ADMINS *                admins;
     TARIFFS *               tariffs;
     STORE *                 store;
     MODULE_SETTINGS         settings;
     RPC_CONFIG_SETTINGS     rpcConfigSettings;
     USERS *                 users;
     ADMINS *                admins;
     TARIFFS *               tariffs;
     STORE *                 store;
     MODULE_SETTINGS         settings;

-    const SETTINGS *        stgSettings;

     xmlrpc_c::registry      rpcRegistry;
     xmlrpc_c::serverAbyss * rpcServer;
     bool                    running;
     xmlrpc_c::registry      rpcRegistry;
     xmlrpc_c::serverAbyss * rpcServer;
     bool                    running;


@@ -102,6 +103,8 @@ private:
     pthread_t               tid;
     std::map<std::string,
              ADMIN_INFO>    cookies;
     pthread_t               tid;
     std::map<std::string,
              ADMIN_INFO>    cookies;

+    size_t                  dayFee;
+    std::vector<std::string> dirNames;

 };
 
 #endif
 };
 
 #endif