Removee the spaces

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 11e755bad95a733526b4f96bb4d371b9fe6bda6d..c7bf3d0091b2b026948d30eee26528a8ac8bf941 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -16,6 +16,7 @@
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>

+ *    Author : Maxim Mamontov <faust@stargazer.dp.ua>

  */
 
 #include "stg/servconf.h"
  */
 
 #include "stg/servconf.h"


@@ -23,26 +24,26 @@
 #include "netunit.h"
 
 #include "parsers/simple.h"
 #include "netunit.h"
 
 #include "parsers/simple.h"

+#include "parsers/get_container.h"

 
 #include "parsers/server_info.h"
 
 
 #include "parsers/server_info.h"
 

-#include "parsers/get_admins.h"

 #include "parsers/get_admin.h"
 #include "parsers/chg_admin.h"
 
 #include "parsers/get_admin.h"
 #include "parsers/chg_admin.h"
 

-#include "parsers/get_tariffs.h"

 #include "parsers/get_tariff.h"
 #include "parsers/chg_tariff.h"
 
 #include "parsers/auth_by.h"
 #include "parsers/get_tariff.h"
 #include "parsers/chg_tariff.h"
 
 #include "parsers/auth_by.h"

-#include "parsers/get_users.h"

 #include "parsers/get_user.h"
 #include "parsers/chg_user.h"
 
 #include "parsers/get_user.h"
 #include "parsers/chg_user.h"
 

-#include "parsers/get_services.h"

 #include "parsers/get_service.h"
 #include "parsers/chg_service.h"
 
 #include "parsers/get_service.h"
 #include "parsers/chg_service.h"
 

+#include "parsers/get_corp.h"
+#include "parsers/chg_corp.h"
+

 #include "parsers/base.h"
 
 #include "stg/common.h"
 #include "parsers/base.h"
 
 #include "stg/common.h"


@@ -59,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);


@@ -86,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);
 


@@ -107,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;


@@ -136,9 +138,9 @@ 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_ADMINS::PARSER>("<GetAdmins/>", f, data);
+return pImpl->Exec<GET_CONTAINER::PARSER<GET_ADMIN::PARSER> >("admins", "<GetAdmins/>", f, data);

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


@@ -168,9 +170,9 @@ 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_TARIFFS::PARSER>("<GetTariffs/>", f, data);
+return pImpl->Exec<GET_CONTAINER::PARSER<GET_TARIFF::PARSER> >("tariffs", "<GetTariffs/>", f, data);

 }
 
 int SERVCONF::GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data)
 }
 
 int SERVCONF::GetTariff(const std::string & name, GET_TARIFF::CALLBACK f, void * data)


@@ -200,9 +202,9 @@ 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_USERS::PARSER>("<GetUsers/>", f, data);
+return pImpl->Exec<GET_CONTAINER::PARSER<GET_USER::PARSER> >("users", "<GetUsers/>", f, data);

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


@@ -245,9 +247,9 @@ 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_SERVICES::PARSER>("<GetServices/>", f, data);
+return pImpl->Exec<GET_CONTAINER::PARSER<GET_SERVICE::PARSER> >("services", "<GetServices/>", f, data);

 }
 
 int SERVCONF::GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data)
 }
 
 int SERVCONF::GetService(const std::string & name, GET_SERVICE::CALLBACK f, void * data)


@@ -275,6 +277,38 @@ int SERVCONF::DelService(const std::string & name, SIMPLE::CALLBACK f, void * da
 return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name + "\"/>", f, data);
 }
 
 return pImpl->Exec<SIMPLE::PARSER>("DelService", "<DelService name=\"" + name + "\"/>", f, data);
 }
 

+// -- Corporations --
+
+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);
+}
+
+int SERVCONF::GetCorp(const std::string & name, GET_CORP::CALLBACK f, void * data)
+{
+return pImpl->Exec<GET_CORP::PARSER>("<GetCorp name=\"" + name + "\"/>", f, data);
+}
+
+int SERVCONF::ChgCorp(const CORP_CONF_RES & conf, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + conf.name.data() + "\">" + CHG_CORP::Serialize(conf) + "</SetCorp>", f, data);
+}
+
+int SERVCONF::AddCorp(const std::string & name,
+                      const CORP_CONF_RES & conf,
+                      SIMPLE::CALLBACK f, void * data)
+{
+int res = pImpl->Exec<SIMPLE::PARSER>("AddCorp", "<AddCorp name=\"" + name + "\"/>", f, data);
+if (res != st_ok)
+    return res;
+return pImpl->Exec<SIMPLE::PARSER>("SetCorp", "<SetCorp name=\"" + name + "\">" + CHG_CORP::Serialize(conf) + "</SetCorp>", f, data);
+}
+
+int SERVCONF::DelCorp(const std::string & name, SIMPLE::CALLBACK f, void * data)
+{
+return pImpl->Exec<SIMPLE::PARSER>("DelCorp", "<DelCorp name=\"" + name + "\"/>", f, data);
+}
+

 const std::string & SERVCONF::GetStrError() const
 {
 return pImpl->GetStrError();
 const std::string & SERVCONF::GetStrError() const
 {
 return pImpl->GetStrError();


@@ -286,7 +320,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)


@@ -318,47 +351,34 @@ if ((ret = nt.Connect()) != st_ok)
     errorMsg = nt.GetError();
     return ret;
     }
     errorMsg = nt.GetError();
     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();
     return ret;
     }
 
     {
     errorMsg = nt.GetError();
     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();
     errorMsg = nt.GetError();

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

     return ret;
     }
     return ret;
     }

-if ((ret = nt.Transact(request.c_str())) != st_ok)
-    {
-    nt.SetRxCallback(this, ParserRecv);
-    errorMsg = nt.GetError();
-    f(false, errorMsg, "", data);
-    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;
 }