X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8569ecdc2c9368dc0fe650b901cce7b37337ffec..237f834a52db0d12c85f70c5e65f48ec1923d00a:/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp?ds=sidebyside diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index ec3e3ee3..a5ffcf5b 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -30,6 +30,16 @@ #include "configproto.h" +#include "parser.h" +#include "parser_auth_by.h" +#include "parser_user_info.h" + +#include "stg/users.h" +#include "stg/admins.h" +#include "stg/tariffs.h" +#include "stg/logger.h" +#include "stg/common.h" + #include //----------------------------------------------------------------------------- @@ -39,7 +49,6 @@ CONFIGPROTO * cp = static_cast(data); if (cp->currParser) { - cp->currParser->SetAnswerList(&cp->answerList); cp->currParser->SetCurrAdmin(*cp->currAdmin); cp->currParser->ParseStart(data, el, attr); } @@ -47,7 +56,6 @@ else { for (size_t i = 0; i < cp->dataParser.size(); i++) { - cp->dataParser[i]->SetAnswerList(&cp->answerList); cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin); cp->dataParser[i]->Reset(); if (cp->dataParser[i]->ParseStart(data, el, attr) == 0) @@ -96,27 +104,27 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l) admins(NULL), currParser(NULL) { -dataParser.push_back(&parserGetServInfo); - -dataParser.push_back(&parserGetUsers); -dataParser.push_back(&parserGetUser); -dataParser.push_back(&parserChgUser); -dataParser.push_back(&parserAddUser); -dataParser.push_back(&parserDelUser); -dataParser.push_back(&parserCheckUser); -dataParser.push_back(&parserSendMessage); -dataParser.push_back(&parserAuthBy); -dataParser.push_back(&parserUserInfo); - -dataParser.push_back(&parserGetTariffs); -dataParser.push_back(&parserAddTariff); -dataParser.push_back(&parserDelTariff); -dataParser.push_back(&parserChgTariff); - -dataParser.push_back(&parserGetAdmins); -dataParser.push_back(&parserChgAdmin); -dataParser.push_back(&parserDelAdmin); -dataParser.push_back(&parserAddAdmin); +dataParser.push_back(new PARSER_GET_SERVER_INFO); + +dataParser.push_back(new PARSER_GET_USERS); +dataParser.push_back(new PARSER_GET_USER); +dataParser.push_back(new PARSER_CHG_USER); +dataParser.push_back(new PARSER_ADD_USER); +dataParser.push_back(new PARSER_DEL_USER); +dataParser.push_back(new PARSER_CHECK_USER); +dataParser.push_back(new PARSER_SEND_MESSAGE); +dataParser.push_back(new PARSER_AUTH_BY); +dataParser.push_back(new PARSER_USER_INFO); + +dataParser.push_back(new PARSER_GET_TARIFFS); +dataParser.push_back(new PARSER_ADD_TARIFF); +dataParser.push_back(new PARSER_DEL_TARIFF); +dataParser.push_back(new PARSER_CHG_TARIFF); + +dataParser.push_back(new PARSER_GET_ADMINS); +dataParser.push_back(new PARSER_CHG_ADMIN); +dataParser.push_back(new PARSER_DEL_ADMIN); +dataParser.push_back(new PARSER_ADD_ADMIN); xmlParser = XML_ParserCreate(NULL); @@ -130,6 +138,8 @@ if (!xmlParser) //----------------------------------------------------------------------------- CONFIGPROTO::~CONFIGPROTO() { +for (size_t i = 0; i < dataParser.size(); ++i) + delete dataParser[i]; XML_ParserFree(xmlParser); } //-----------------------------------------------------------------------------