X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/85513928f6a270af94c1477f5ae2773647b04cd7..df56b2568e80784a3350fa9527430538fa792b79:/stglibs/srvconf.lib/servconf.cpp diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp index e7ecfdf4..046190ee 100644 --- a/stglibs/srvconf.lib/servconf.cpp +++ b/stglibs/srvconf.lib/servconf.cpp @@ -50,8 +50,10 @@ #include #include +#include #include +#include using namespace STG; @@ -60,6 +62,9 @@ class SERVCONF::IMPL public: IMPL(const std::string & server, uint16_t port, const std::string & login, const std::string & password); + IMPL(const std::string & server, uint16_t port, + const std::string & localAddress, uint16_t localPort, + const std::string & login, const std::string & password); ~IMPL() { XML_ParserFree(parser); } const std::string & GetStrError() const; @@ -71,20 +76,23 @@ public: template int Exec(const std::string & request, C callback, void * data) { - P cp(callback, data); + P cp(callback, data, encoding); return ExecImpl(request, cp); } template int Exec(const std::string & tag, const std::string & request, C callback, void * data) { - P cp(tag, callback, data); + P cp(tag, callback, data, encoding); return ExecImpl(request, cp); } + const std::string & Encoding() const { return encoding; } + private: NETTRANSACT nt; + std::string encoding; std::string errorMsg; XML_Parser parser; @@ -99,10 +107,10 @@ SERVCONF::IMPL * sc = static_cast(data); if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ERROR) { - strprintf(&sc->errorMsg, "XML parse error at line %d: %s", + strprintf(&sc->errorMsg, "XML parse error at line %d, %d: %s. Is final: %d", static_cast(XML_GetCurrentLineNumber(sc->parser)), - XML_ErrorString(XML_GetErrorCode(sc->parser))); - printf("%s\n", sc->errorMsg.c_str()); + static_cast(XML_GetCurrentColumnNumber(sc->parser)), + XML_ErrorString(XML_GetErrorCode(sc->parser)), (int)final); return false; } @@ -121,6 +129,13 @@ SERVCONF::SERVCONF(const std::string & server, uint16_t port, { } +SERVCONF::SERVCONF(const std::string & server, uint16_t port, + const std::string & localAddress, uint16_t localPort, + const std::string & login, const std::string & password) + : pImpl(new IMPL(server, port, localAddress, localPort, login, password)) +{ +} + SERVCONF::~SERVCONF() { delete pImpl; @@ -150,7 +165,7 @@ return pImpl->Exec("", f, int SERVCONF::ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("ChgAdmin", "", f, data); +return pImpl->Exec("ChgAdmin", "Encoding()) + "/>", f, data); } int SERVCONF::AddAdmin(const std::string & login, @@ -160,7 +175,7 @@ int SERVCONF::AddAdmin(const std::string & login, int res = pImpl->Exec("AddAdmin", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("ChgAdmin", "", f, data); +return pImpl->Exec("ChgAdmin", "Encoding()) + "/>", f, data); } int SERVCONF::DelAdmin(const std::string & login, SIMPLE::CALLBACK f, void * data) @@ -182,7 +197,7 @@ return pImpl->Exec("", f, int SERVCONF::ChgTariff(const TARIFF_DATA_RES & tariffData, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData, pImpl->Encoding()) + "", f, data); } int SERVCONF::AddTariff(const std::string & name, @@ -192,7 +207,7 @@ int SERVCONF::AddTariff(const std::string & name, int res = pImpl->Exec("AddTariff", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData) + "", f, data); +return pImpl->Exec("SetTariff", "" + CHG_TARIFF::Serialize(tariffData, pImpl->Encoding()) + "", f, data); } int SERVCONF::DelTariff(const std::string & name, SIMPLE::CALLBACK f, void * data) @@ -217,7 +232,7 @@ int SERVCONF::ChgUser(const std::string & login, const USER_STAT_RES & stat, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("" + CHG_USER::Serialize(conf, stat) + "", f, data); +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat, pImpl->Encoding()) + "", f, data); } int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data) @@ -225,9 +240,15 @@ int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data return pImpl->Exec("DelUser", "", f, data); } -int SERVCONF::AddUser(const std::string & login, SIMPLE::CALLBACK f, void * data) +int SERVCONF::AddUser(const std::string & login, + const USER_CONF_RES & conf, + const USER_STAT_RES & stat, + SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("AddUser", "", f, data); +int res = pImpl->Exec("AddUser", "", f, data); +if (res != st_ok) + return res; +return pImpl->Exec("" + CHG_USER::Serialize(conf, stat, pImpl->Encoding()) + "", f, data); } int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data) @@ -237,7 +258,7 @@ return pImpl->Exec("", int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SendMessage", "", f, data); +return pImpl->Exec("SendMessageResult", "", f, data); } int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data) @@ -259,7 +280,7 @@ return pImpl->Exec("", f int SERVCONF::ChgService(const SERVICE_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +return pImpl->Exec("SetService", "Encoding()) + "/>", f, data); } int SERVCONF::AddService(const std::string & name, @@ -269,7 +290,7 @@ int SERVCONF::AddService(const std::string & name, int res = pImpl->Exec("AddService", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("SetService", "" + CHG_SERVICE::Serialize(conf) + "", f, data); +return pImpl->Exec("SetService", "Encoding()) + "/>", f, data); } int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * data) @@ -291,7 +312,7 @@ return pImpl->Exec("", f, data int SERVCONF::ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data) { -return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf) + "", f, data); +return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf, pImpl->Encoding()) + "", f, data); } int SERVCONF::AddCorp(const std::string & name, @@ -301,7 +322,7 @@ int SERVCONF::AddCorp(const std::string & name, int res = pImpl->Exec("AddCorp", "", f, data); if (res != st_ok) return res; -return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf) + "", f, data); +return pImpl->Exec("SetCorp", "" + CHG_CORP::Serialize(conf, pImpl->Encoding()) + "", f, data); } int SERVCONF::DelCorp(const std::string & name, SIMPLE::CALLBACK f, void * data) @@ -317,8 +338,22 @@ return pImpl->GetStrError(); //----------------------------------------------------------------------------- SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, const std::string & login, const std::string & password) - : nt( server, port, login, password ) + : nt(server, port, login, password) +{ +setlocale(LC_ALL, ""); +setlocale(LC_NUMERIC, "C"); +encoding = nl_langinfo(CODESET); +parser = XML_ParserCreate(NULL); +} +//----------------------------------------------------------------------------- +SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port, + const std::string & localAddress, uint16_t localPort, + const std::string & login, const std::string & password) + : nt(server, port, localAddress, localPort, login, password) { +setlocale(LC_ALL, ""); +setlocale(LC_NUMERIC, "C"); +encoding = nl_langinfo(CODESET); parser = XML_ParserCreate(NULL); } //-----------------------------------------------------------------------------