From ed076ff39f812dfd0c21a82d26393744e602c06e Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Tue, 7 Dec 2010 17:42:35 +0200 Subject: [PATCH] =?utf8?q?=D0=92=20=D0=BD=D0=B0=D0=B1=D0=BE=D1=80=D0=B5=20?= =?utf8?q?=D0=BF=D0=B0=D1=80=D1=81=D0=B5=D1=80=D0=BE=D0=B2=20=D0=BA=D0=BB?= =?utf8?q?=D0=B0=D1=81=D1=81=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=BE=D0=B3?= =?utf8?q?=D0=BE=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0?= =?utf8?q?=D1=82=D0=BE=D1=80=D0=B0=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?utf8?q?=D0=B5=D0=BD=D1=8B=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D1=80=D1=83?= =?utf8?q?=D0=BA=D1=82=D0=BE=D1=80=D1=8B=20=D0=B8=20=D1=81=D0=B4=D0=B5?= =?utf8?q?=D0=BB=D0=B0=D0=BD=D1=8B=20=D1=81=D1=82=D0=B8=D0=BB=D0=B8=D1=81?= =?utf8?q?=D1=82=D0=B8=D1=87=D0=B5=D1=81=D0=BA=D0=B8=D0=B5=20=D0=BF=D1=80?= =?utf8?q?=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../plugins/configuration/sgconfig/parser.h | 146 +++++++++--------- 1 file changed, 77 insertions(+), 69 deletions(-) diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index 4930db0f..9fe839f7 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -70,6 +70,7 @@ public: 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(); @@ -80,6 +81,7 @@ private: 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(); @@ -91,13 +93,14 @@ private: 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 login; - RESETABLE password; - RESETABLE privAsString; + RESETABLE login; + RESETABLE password; + RESETABLE privAsString; }; //----------------------------------------------------------------------------- class PARSER_GET_SERVER_INFO: public BASE_PARSER @@ -112,11 +115,11 @@ public: 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; }; @@ -124,54 +127,57 @@ private: 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 { 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 { 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; + string tariffToAdd; }; //----------------------------------------------------------------------------- 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; + string tariffToDel; }; //----------------------------------------------------------------------------- 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 string & s, int * params); + int ParseSlashedDoubleParams(int paramsNum, const string & s, double * params); + int CheckTariffData(); + int AplayChanges(); TARIFF_DATA_RES td; }; @@ -179,79 +185,81 @@ private: 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(); + string login; }; //----------------------------------------------------------------------------- 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 *); + string EncChar2String(const char *); USER_STAT_RES * usr; USER_CONF_RES * ucr; RESETABLE * upr; RESETABLE * downr; - string cashMsg; - string login; + string cashMsg; + string login; - int CheckUserData(); - int AplayChanges(); - bool cashMustBeAdded; - int res; + int CheckUserData(); + int AplayChanges(); + bool cashMustBeAdded; + int res; }; //----------------------------------------------------------------------------- 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) {} + 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_iter u; }; //----------------------------------------------------------------------------- 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 { 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) {} + 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 logins; - int ParseLogins(const char * logins); - int result; + int result; STG_MSG msg; user_iter u; }; //----------------------------------------------------------------------------- #endif //PARSER_H - - -- 2.43.2