X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..bc4721533e4041a19b42cb247064f9f42c3f9d5f:/projects/stargazer/plugins/configuration/sgconfig/parser.h?ds=sidebyside

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index 4930db0f..da62dcb4 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h
@@ -9,19 +9,21 @@
 
 #include <list>
 #include <string>
+#include <vector>
 
-#include "resetable.h"
-#include "stg_const.h"
-#include "base_store.h"
-#include "../../../admins.h"
-#include "../../../users.h"
-#include "stg_message.h"
+#include "stg/resetable.h"
+#include "stg/const.h"
+#include "stg/store.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/users.h"
+#include "stg/message.h"
 
-using namespace std;
+class TARIFFS;
+class SETTINGS;
 
 //-----------------------------------------------------------------------------
-class BASE_PARSER
-{
+class BASE_PARSER {
 public:
     BASE_PARSER()
         : admins(NULL),
@@ -29,229 +31,219 @@ public:
           tariffs(NULL),
           store(NULL),
           settings(NULL),
-          currAdmin(),
-          depth(0)
-    { };
-    virtual ~BASE_PARSER() {};
+          currAdmin(NULL),
+          depth(0),
+          answerList(NULL)
+    { }
+    virtual ~BASE_PARSER() {}
     virtual int ParseStart(void *data, const char *el, const char **attr) = 0;
     virtual int ParseEnd(void *data, const char *el) = 0;
     virtual void CreateAnswer() = 0;
-    virtual void SetAnswerList(list<string> * ansList) { answerList = ansList; };
+    virtual void SetAnswerList(std::list<std::string> * ansList) { answerList = ansList; }
 
-    virtual void SetUsers(USERS * u) { users = u; };
-    virtual void SetAdmins(ADMINS * a) { admins = a; };
-    virtual void SetTariffs(TARIFFS * t) { tariffs = t; };
-    virtual void SetStore(BASE_STORE * s) { store = s; };
-    virtual void SetStgSettings(const SETTINGS * s) { settings = s; };
+    virtual void SetUsers(USERS * u) { users = u; }
+    virtual void SetAdmins(ADMINS * a) { admins = a; }
+    virtual void SetTariffs(TARIFFS * t) { tariffs = t; }
+    virtual void SetStore(STORE * s) { store = s; }
+    virtual void SetStgSettings(const SETTINGS * s) { settings = s; }
 
-    virtual void SetCurrAdmin(const ADMIN & cua) { currAdmin = cua; };
-    virtual string & GetStrError(){return strError;};
-    virtual void Reset(){ answerList->clear(); depth = 0; };
+    virtual void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; }
+    virtual std::string & GetStrError() { return strError; }
+    virtual void Reset() { answerList->clear(); depth = 0; }
 protected:
-    string           strError;
+    std::string      strError;
     ADMINS *         admins;
     USERS *          users;
     TARIFFS *        tariffs;
-    BASE_STORE *     store;
+    STORE *          store;
     const SETTINGS * settings;
-    ADMIN            currAdmin;
+    ADMIN          * currAdmin;
     int              depth;
-    list<string> *   answerList;
+    std::list<std::string> * answerList;
 };
 //-----------------------------------------------------------------------------
-class PARSER_GET_ADMINS: public BASE_PARSER
-{
+class PARSER_GET_ADMINS: public BASE_PARSER {
 public:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 };
 //-----------------------------------------------------------------------------
-class PARSER_ADD_ADMIN: public BASE_PARSER
-{
+class PARSER_ADD_ADMIN: public BASE_PARSER {
 public:
+        PARSER_ADD_ADMIN() : BASE_PARSER() {}
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:
-    string adminToAdd;
+    std::string adminToAdd;
 };
 //-----------------------------------------------------------------------------
-class PARSER_DEL_ADMIN: public BASE_PARSER
-{
+class PARSER_DEL_ADMIN: public BASE_PARSER {
 public:
+        PARSER_DEL_ADMIN() : BASE_PARSER() {}
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:
     int CheckAttr(const char **attr);
-    string adminToDel;
+    std::string adminToDel;
 };
 //-----------------------------------------------------------------------------
-class PARSER_CHG_ADMIN: public BASE_PARSER
-{
+class PARSER_CHG_ADMIN: public BASE_PARSER {
 public:
+        PARSER_CHG_ADMIN() : BASE_PARSER() {}
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 private:
-    RESETABLE<string>   login;
-    RESETABLE<string>   password;
-    RESETABLE<string>   privAsString;
+    RESETABLE<std::string> login;
+    RESETABLE<std::string> password;
+    RESETABLE<std::string> privAsString;
 };
 //-----------------------------------------------------------------------------
-class PARSER_GET_SERVER_INFO: public BASE_PARSER
-{
+class PARSER_GET_SERVER_INFO: public BASE_PARSER {
 public:
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
 };
-
 //-----------------------------------------------------------------------------
-class PARSER_GET_USER: public BASE_PARSER
-{
+class PARSER_GET_USER: public BASE_PARSER {
 public:
-            PARSER_GET_USER();
-            ~PARSER_GET_USER(){};
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_GET_USER();
+        ~PARSER_GET_USER(){};
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
-    string  login;
+    std::string login;
 };
 //-----------------------------------------------------------------------------
-class PARSER_GET_USERS: public BASE_PARSER
-{
+class PARSER_GET_USERS: public BASE_PARSER {
 public:
-            PARSER_GET_USERS();
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_GET_USERS();
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
-    time_t  lastUserUpdateTime;
-    bool    lastUpdateFound;
+    time_t lastUserUpdateTime;
+    bool lastUpdateFound;
 };
 //-----------------------------------------------------------------------------
-class PARSER_GET_TARIFFS: public BASE_PARSER
-{
+class PARSER_GET_TARIFFS: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 };
 //-----------------------------------------------------------------------------
-class PARSER_ADD_TARIFF: public BASE_PARSER
-{
+class PARSER_ADD_TARIFF: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_ADD_TARIFF() : BASE_PARSER() {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
-    string  tariffToAdd;
+    std::string tariffToAdd;
 };
 //-----------------------------------------------------------------------------
-class PARSER_DEL_TARIFF: public BASE_PARSER
-{
+class PARSER_DEL_TARIFF: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_DEL_TARIFF() : BASE_PARSER() {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
-    string  tariffToDel;
+    std::string tariffToDel;
 };
 //-----------------------------------------------------------------------------
-class PARSER_CHG_TARIFF: public BASE_PARSER
-{
+class PARSER_CHG_TARIFF: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_CHG_TARIFF() : BASE_PARSER() {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
-    int     ParseSlashedIntParams(int paramsNum, const string & s, int * params);
-    int     ParseSlashedDoubleParams(int paramsNum, const string & s, double * params);
-    int     CheckTariffData();
-    int     AplayChanges();
+    int ParseSlashedIntParams(int paramsNum, const std::string & s, int * params);
+    int ParseSlashedDoubleParams(int paramsNum, const std::string & s, double * params);
+    int CheckTariffData();
+    int AplayChanges();
 
     TARIFF_DATA_RES td;
 };
 //-----------------------------------------------------------------------------/
-class PARSER_ADD_USER: public BASE_PARSER
-{
+class PARSER_ADD_USER: public BASE_PARSER {
 public:
-            PARSER_ADD_USER();
-    virtual ~PARSER_ADD_USER(){};
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
-    void    Reset();
+        PARSER_ADD_USER();
+        ~PARSER_ADD_USER() {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
+    void Reset();
 private:
-    int     CheckUserData();
-    string  login;
+    int CheckUserData();
+    std::string login;
 };
 //-----------------------------------------------------------------------------
-class PARSER_CHG_USER: public BASE_PARSER
-{
+class PARSER_CHG_USER: public BASE_PARSER {
 public:
-                    PARSER_CHG_USER();
-                    ~PARSER_CHG_USER();
-    int             ParseStart(void *data, const char *el, const char **attr);
-    int             ParseEnd(void *data, const char *el);
-    void            CreateAnswer();
-    void            Reset();
+        PARSER_CHG_USER();
+        ~PARSER_CHG_USER();
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
+    void Reset();
 private:
-    string          EncChar2String(const char *);
+    std::string EncChar2String(const char *);
+    int AplayChanges();
 
     USER_STAT_RES * usr;
     USER_CONF_RES * ucr;
     RESETABLE<uint64_t> * upr;
     RESETABLE<uint64_t> * downr;
-    string          cashMsg;
-    string          login;
-
-    int             CheckUserData();
-    int             AplayChanges();
-    bool            cashMustBeAdded;
-    int             res;
+    std::string cashMsg;
+    std::string login;
+    bool cashMustBeAdded;
+    int res;
 };
 //-----------------------------------------------------------------------------
-class PARSER_DEL_USER: public BASE_PARSER
-{
+class PARSER_DEL_USER: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_DEL_USER() : BASE_PARSER(), res(0), u(NULL) {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 
 private:
-    int         res;
-    user_iter   u;
+    int res;
+    USER * u;
 };
 //-----------------------------------------------------------------------------
-class PARSER_CHECK_USER: public BASE_PARSER
-{
+class PARSER_CHECK_USER: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_CHECK_USER() : BASE_PARSER(), result(false) {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
-    bool    result;
+    bool result;
 };
 //-----------------------------------------------------------------------------
-class PARSER_SEND_MESSAGE: public BASE_PARSER
-{
+class PARSER_SEND_MESSAGE: public BASE_PARSER {
 public:
-    int     ParseStart(void *data, const char *el, const char **attr);
-    int     ParseEnd(void *data, const char *el);
-    void    CreateAnswer();
+        PARSER_SEND_MESSAGE() : BASE_PARSER(), result(0), u(NULL) {}
+    int ParseStart(void *data, const char *el, const char **attr);
+    int ParseEnd(void *data, const char *el);
+    void CreateAnswer();
 private:
+    int ParseLogins(const char * logins);
+
     enum {res_ok, res_params_error, res_unknown};
-    vector<string> logins;
-    int     ParseLogins(const char * logins);
-    int     result;
+    std::vector<std::string> logins;
+    int result;
     STG_MSG msg;
-    user_iter u;
+    USER * u;
 };
 //-----------------------------------------------------------------------------
 #endif //PARSER_H
-
-