Added RawXML method and related stuff.

diff --git a/stglibs/srvconf.lib/include/stg/servconf.h b/stglibs/srvconf.lib/include/stg/servconf.h
index 9c9acb7aa596fa995c3815e13f2b7790b7612ebe..b3bb7523bd3f3e3e9db7937d29b6676596c6c6da 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf.h
+++ b/stglibs/srvconf.lib/include/stg/servconf.h
@@ -49,6 +49,8 @@ public:
 
     int ServerInfo(SERVER_INFO::CALLBACK f, void * data);
 
+    int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
+
     int GetAdmins(GET_ADMINS::CALLBACK f, void * data);
     int GetAdmin(const std::string & login, GET_ADMIN::CALLBACK f, void * data);
     int ChgAdmin(const ADMIN_CONF_RES & conf, SIMPLE::CALLBACK f, void * data);

diff --git a/stglibs/srvconf.lib/include/stg/servconf_types.h b/stglibs/srvconf.lib/include/stg/servconf_types.h
index f46aadb5e80c1647c7456f7eca19a2eb03b8efbf..86df8e959395458dc1eec7cbb0354e1cf886e44d 100644 (file)
--- a/stglibs/srvconf.lib/include/stg/servconf_types.h
+++ b/stglibs/srvconf.lib/include/stg/servconf_types.h
@@ -99,6 +99,13 @@ typedef void (* CALLBACK)(bool result, const std::string & reason, const INFO &
 
 } // namespace SERVER_INFO
 
+namespace RAW_XML
+{
+
+typedef void (* CALLBACK)(bool result, const std::string & reason, const std::string & response, void * data);
+
+}
+
 namespace GET_USER
 {
 

diff --git a/stglibs/srvconf.lib/netunit.h b/stglibs/srvconf.lib/netunit.h
index fb2a1e289bdcd162281ede57fdb5536473c1e27a..6b6cef53d12a9a7ac0dc63aab94f439bb21553c7 100644 (file)
--- a/stglibs/srvconf.lib/netunit.h
+++ b/stglibs/srvconf.lib/netunit.h
@@ -43,6 +43,7 @@ public:
     const std::string & GetError() const { return errorMsg; }
 
     void    SetRxCallback(void * data, RxCallback_t cb);
+    RxCallback_t GetRxCallback() const { return dataRxCallBack; }
 
     int     Connect();
     int     Disconnect();

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 7aea7e199321b0512b619891e58fb54b01377b2d..01f2179020a09ececae16fb6cff3d6839fd54bfa 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -56,6 +56,8 @@ public:
     static void Start(void * data, const char * el, const char ** attr);
     static void End(void * data, const char * el);
 
+    int RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data);
+
     template <class P, typename C>
     int Exec(const std::string & request, C callback, void * data)
     {
@@ -76,11 +78,12 @@ private:
     std::string errorMsg;
     XML_Parser parser;
 
-    static bool AnsRecv(void * data, const std::string & chunk, bool final);
+    static bool ParserRecv(void * data, const std::string & chunk, bool final);
+    static bool SimpleRecv(void * data, const std::string & chunk, bool final);
     int ExecImpl(const std::string & request, PARSER & cp);
 };
 
-bool SERVCONF::IMPL::AnsRecv(void * data, const std::string & chunk, bool final)
+bool SERVCONF::IMPL::ParserRecv(void * data, const std::string & chunk, bool final)
 {
 SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
 
@@ -96,6 +99,12 @@ if (XML_Parse(sc->parser, chunk.c_str(), chunk.length(), final) == XML_STATUS_ER
 return true;
 }
 
+bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool final)
+{
+*static_cast<std::string *>(data) += chunk;
+return true;
+}
+
 SERVCONF::SERVCONF(const std::string & server, uint16_t port,
                    const std::string & login, const std::string & password)
     : pImpl(new IMPL(server, port, login, password))
@@ -112,6 +121,10 @@ int SERVCONF::ServerInfo(SERVER_INFO::CALLBACK f, void * data)
 return pImpl->Exec<SERVER_INFO::PARSER>("<GetServerInfo/>", f, data);
 }
 
+int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data)
+{
+}
+
 // -- Admins --
 
 int SERVCONF::GetAdmins(GET_ADMINS::CALLBACK f, void * data)
@@ -200,7 +213,7 @@ SERVCONF::IMPL::IMPL(const std::string & server, uint16_t port,
     : nt( server, port, login, password )
 {
 parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, AnsRecv);
+nt.SetRxCallback(this, ParserRecv);
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
@@ -245,3 +258,34 @@ if ((ret = nt.Disconnect()) != st_ok)
 
 return st_ok;
 }
+
+int SERVCONF::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data)
+{
+std::string response;
+nt.SetRxCallback(&response, SimpleRecv);
+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();
+    f(false, errorMsg, "", data);
+    return ret;
+    }
+if ((ret = nt.Disconnect()) != st_ok)
+    {
+    nt.SetRxCallback(this, ParserRecv);
+    errorMsg = nt.GetError();
+    f(false, errorMsg, "", data);
+    return ret;
+    }
+nt.SetRxCallback(this, ParserRecv);
+f(true, "", response, data);
+return st_ok;
+}