Fixed some abbreviations.

[stg.git] / stglibs / srvconf.lib / servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index a9881f05f3b8ecb9c87a8ecd0e3f8a8fc53a1f02..0f91a563033c52ba650204b356f05afafa8a5449 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -60,6 +60,7 @@ class SERVCONF::IMPL
 public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);
 public:
     IMPL(const std::string & server, uint16_t port,
          const std::string & login, const std::string & password);

+    ~IMPL() { XML_ParserFree(parser); }

 
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);
 
     const std::string & GetStrError() const;
     static void Start(void * data, const char * el, const char ** attr);


@@ -87,12 +88,12 @@ private:
     std::string errorMsg;
     XML_Parser parser;
 
     std::string errorMsg;
     XML_Parser parser;
 

-    static bool ParserRecv(void * data, const std::string & chunk, bool final);
-    static bool SimpleRecv(void * data, const std::string & chunk, bool final);
+    static bool ParserRecv(const std::string & chunk, bool final, void * data);
+    static bool SimpleRecv(const std::string & chunk, bool final, void * data);

     int ExecImpl(const std::string & request, PARSER & cp);
 };
 
     int ExecImpl(const std::string & request, PARSER & cp);
 };
 

-bool SERVCONF::IMPL::ParserRecv(void * data, const std::string & chunk, bool final)
+bool SERVCONF::IMPL::ParserRecv(const std::string & chunk, bool final, void * data)

 {
 SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
 
 {
 SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
 


@@ -108,7 +109,7 @@ if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ER
 return true;
 }
 
 return true;
 }
 

-bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool /*final*/)
+bool SERVCONF::IMPL::SimpleRecv(const std::string & chunk, bool /*final*/, void * data)

 {
 *static_cast<std::string *>(data) += chunk;
 return true;
 {
 *static_cast<std::string *>(data) += chunk;
 return true;


@@ -137,7 +138,7 @@ return pImpl->RawXML(request, f, data);
 
 // -- Admins --
 
 
 // -- Admins --
 

-int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
+int SERVCONF::GetAdmins(GET_CONTAINER::CALLBACK<GET_ADMIN::INFO>::TYPE f, void * data)

 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_ADMIN::PARSER> >("admins", "<GetAdmins/>", f, data);
 }
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_ADMIN::PARSER> >("admins", "<GetAdmins/>", f, data);
 }


@@ -169,7 +170,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelAdmin", "<DelAdmin login=\"" + login + "\
 
 // -- Tariffs --
 
 
 // -- Tariffs --
 

-int SERVCONF::GetTariffs(GET_TARIFFS::CALLBACK f, void * data)
+int SERVCONF::GetTariffs(GET_CONTAINER::CALLBACK<GET_TARIFF::INFO>::TYPE f, void * data)

 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_TARIFF::PARSER> >("tariffs", "<GetTariffs/>", f, data);
 }
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_TARIFF::PARSER> >("tariffs", "<GetTariffs/>", f, data);
 }


@@ -201,7 +202,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelTariff", "<DelTariff name=\"" + name + "\
 
 // -- Users --
 
 
 // -- Users --
 

-int SERVCONF::GetUsers(GET_USERS::CALLBACK f, void * data)
+int SERVCONF::GetUsers(GET_CONTAINER::CALLBACK<GET_USER::INFO>::TYPE f, void * data)

 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_USER::PARSER> >("users", "<GetUsers/>", f, data);
 }
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_USER::PARSER> >("users", "<GetUsers/>", f, data);
 }


@@ -224,9 +225,15 @@ int SERVCONF::DelUser(const std::string & login, SIMPLE::CALLBACK f, void * data
 return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", f, data);
 }
 
 return pImpl->Exec<SIMPLE::PARSER>("DelUser", "<DelUser login=\"" + login + "\"/>", 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<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+int res = pImpl->Exec<SIMPLE::PARSER>("AddUser", "<AddUser><Login value=\"" + login + "\"/></AddUser>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<CHG_USER::PARSER>("<SetUser><Login value=\"" + login + "\"/>" + CHG_USER::Serialize(conf, stat) + "</SetUser>", f, data);

 }
 
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)
 }
 
 int SERVCONF::AuthBy(const std::string & login, AUTH_BY::CALLBACK f, void * data)


@@ -236,7 +243,7 @@ return pImpl->Exec<AUTH_BY::PARSER>("<GetUserAuthBy login=\"" + login + "\"/>",
 
 int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)
 {
 
 int SERVCONF::SendMessage(const std::string & login, const std::string & text, SIMPLE::CALLBACK f, void * data)
 {

-return pImpl->Exec<SIMPLE::PARSER>("SendMessage", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);
+return pImpl->Exec<SIMPLE::PARSER>("SendMessageResult", "<Message login=\"" + login + "\" msgver=\"1\" msgtype=\"1\" repeat=\"0\" repeatperiod=\"0\" showtime=\"0\" text=\"" + Encode12str(text) + "\"/>", f, data);

 }
 
 int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)
 }
 
 int SERVCONF::CheckUser(const std::string & login, const std::string & password, SIMPLE::CALLBACK f, void * data)


@@ -246,7 +253,7 @@ return pImpl->Exec<SIMPLE::PARSER>("CheckUser", "<CheckUser login=\"" + login +
 
 // -- Services --
 
 
 // -- Services --
 

-int SERVCONF::GetServices(GET_SERVICES::CALLBACK f, void * data)
+int SERVCONF::GetServices(GET_CONTAINER::CALLBACK<GET_SERVICE::INFO>::TYPE f, void * data)

 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_SERVICE::PARSER> >("services", "<GetServices/>", f, data);
 }
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_SERVICE::PARSER> >("services", "<GetServices/>", f, data);
 }


@@ -278,7 +285,7 @@ return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name +
 
 // -- Corporations --
 
 
 // -- Corporations --
 

-int SERVCONF::GetCorporations(GET_CORPORATIONS::CALLBACK f, void * data)
+int SERVCONF::GetCorporations(GET_CONTAINER::CALLBACK<GET_CORP::INFO>::TYPE f, void * data)

 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_CORP::PARSER> >("corporations", "<GetCorporations/>", f, data);
 }
 {
 return pImpl->Exec<GET_CONTAINER::PARSER<GET_CORP::PARSER> >("corporations", "<GetCorporations/>", f, data);
 }


@@ -319,7 +326,6 @@ SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
     : nt( server, port, login, password )
 {
 parser = XML_ParserCreate(NULL);
     : nt( server, port, login, password )
 {
 parser = XML_ParserCreate(NULL);

-nt.SetRxCallback(this, ParserRecv);

 }
 //-----------------------------------------------------------------------------
 void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)


@@ -349,49 +355,38 @@ int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();

+    cp.Failure(errorMsg);

     return ret;
     }
     return ret;
     }

-if ((ret = nt.Transact(request.c_str())) != st_ok)
-    {
-    errorMsg = nt.GetError();
-    return ret;
-    }
-if ((ret = nt.Disconnect()) != st_ok)
+if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok)

     {
     errorMsg = nt.GetError();
     {
     errorMsg = nt.GetError();

+    cp.Failure(errorMsg);

     return ret;
     }
 
     return ret;
     }
 

+nt.Disconnect();

 return st_ok;
 }
 
 return st_ok;
 }
 

-int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data)
+int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK callback, void * data)

 {
 {

-std::string response;
-nt.SetRxCallback(&response, SimpleRecv);

 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {
 int ret = 0;
 if ((ret = nt.Connect()) != st_ok)
     {

-    nt.SetRxCallback(this, ParserRecv);
-    errorMsg = nt.GetError();
-    f(false, errorMsg, "", data);
-    return ret;
-    }
-if ((ret = nt.Transact(request.c_str())) != st_ok)
-    {
-    nt.SetRxCallback(this, ParserRecv);

     errorMsg = nt.GetError();
     errorMsg = nt.GetError();

-    f(false, errorMsg, "", data);
+    callback(false, errorMsg, "", data);

     return ret;
     }
     return ret;
     }

-if ((ret = nt.Disconnect()) != st_ok)
+std::string response;
+if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok)

     {
     {

-    nt.SetRxCallback(this, ParserRecv);

     errorMsg = nt.GetError();
     errorMsg = nt.GetError();

-    f(false, errorMsg, "", data);
+    callback(false, errorMsg, "", data);

     return ret;
     }
     return ret;
     }

-nt.SetRxCallback(this, ParserRecv);
-f(true, "", response, data);
+
+nt.Disconnect();
+callback(true, "", response, data);

 return st_ok;
 }
 return st_ok;
 }