X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/bb0f5269e5987bcd09eaa0afc74d08dcd5dd29b7..175f44511b8b3cf327e4ed9268420e423229691a:/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp?ds=inline

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index 421349c7..dff8760a 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -38,6 +38,7 @@
 #include "stg/admins.h"
 #include "stg/tariffs.h"
 #include "stg/logger.h"
+#include "stg/common.h"
 
 #include <unistd.h>
 
@@ -48,25 +49,23 @@ CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 
 if (cp->currParser)
     {
-    cp->currParser->SetAnswerList(&cp->answerList);
-    cp->currParser->SetCurrAdmin(*cp->currAdmin);
-    cp->currParser->ParseStart(data, el, attr);
+    //cp->currParser->SetCurrAdmin(*cp->currAdmin);
+    cp->currParser->Start(data, el, attr);
     }
 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)
+        //cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);
+        //cp->dataParser[i]->Reset();
+        if (cp->dataParser[i]->Start(data, el, attr) == 0)
             {
             cp->currParser = cp->dataParser[i];
             break;
             }
         else
             {
-            cp->dataParser[i]->Reset();
+            //cp->dataParser[i]->Reset();
             }
         }
     }
@@ -77,8 +76,9 @@ void ParseXMLEnd(void *data, const char *el)
 CONFIGPROTO * cp = static_cast<CONFIGPROTO *>(data);
 if (cp->currParser)
     {
-    if (cp->currParser->ParseEnd(data, el) == 0)
+    if (cp->currParser->End(data, el) == 0)
         {
+        cp->dataAnswer = cp->currParser->GetAnswer();
         cp->currParser = NULL;
         }
     }
@@ -86,8 +86,10 @@ else
     {
     for (size_t i = 0; i < cp->dataParser.size(); i++)
         {
-        if (cp->dataParser[i]->ParseEnd(data, el) == 0)
+        if (cp->dataParser[i]->End(data, el) == 0)
             {
+            cp->dataAnswer = cp->currParser->GetAnswer();
+            cp->currParser = NULL;
             break;
             }
         }
@@ -105,7 +107,7 @@ CONFIGPROTO::CONFIGPROTO(PLUGIN_LOGGER & l)
       admins(NULL),
       currParser(NULL)
 {
-dataParser.push_back(new PARSER_GET_SERVER_INFO);
+/*dataParser.push_back(new PARSER_GET_SERVER_INFO);
 
 dataParser.push_back(new PARSER_GET_USERS);
 dataParser.push_back(new PARSER_GET_USER);
@@ -125,7 +127,7 @@ 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);
+dataParser.push_back(new PARSER_ADD_ADMIN);*/
 
 xmlParser = XML_ParserCreate(NULL);