Replaces vector parsers with a single one.

[stg.git] / stglibs / srvconf.lib / parsers / server_info.cpp

diff --git a/stglibs/srvconf.lib/parsers/server_info.cpp b/stglibs/srvconf.lib/parsers/server_info.cpp
index d4c610e0aea839f9311011cb2d02160aceff2cbf..fbefb2d45ae0049de569c2d437060325c0b9f32c 100644 (file)
--- a/stglibs/srvconf.lib/parsers/server_info.cpp
+++ b/stglibs/srvconf.lib/parsers/server_info.cpp
@@ -19,12 +19,11 @@
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 
  *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
  */
 

-#include "parser_server_info.h"
+#include "server_info.h"

 
 #include "stg/common.h"
 
 #include <cstdio> // sprintf
 
 #include "stg/common.h"
 
 #include <cstdio> // sprintf

-#include <cstddef>

 
 #include <strings.h>
 
 
 #include <strings.h>
 


@@ -39,9 +38,9 @@ const size_t DIRNAME_LEN  = 16;
 
 }
 
 
 }
 

-SERVER_INFO::PARSER::PARSER()
-    : callback(NULL),
-      data(NULL),
+SERVER_INFO::PARSER::PARSER(CALLBACK f, void * d)
+    : callback(f),
+      data(d),

       depth(0),
       parsingAnswer(false)
 {
       depth(0),
       parsingAnswer(false)
 {


@@ -53,19 +52,23 @@ SERVER_INFO::PARSER::PARSER()
     AddParser(propertyParsers, "tariff_num", info.tariffNum);
 
     for (size_t i = 0; i < DIR_NUM; i++)
     AddParser(propertyParsers, "tariff_num", info.tariffNum);
 
     for (size_t i = 0; i < DIR_NUM; i++)

-        AddParser(propertyParsers, "dir_name_" + x2str(i), info.dirName[i], GetEncodedValue);
+        AddParser(propertyParsers, "dir_name_" + unsigned2str(i), info.dirName[i], GetEncodedValue);

 }
 //-----------------------------------------------------------------------------
 int SERVER_INFO::PARSER::ParseStart(const char *el, const char **attr)
 {
 depth++;
 if (depth == 1)
 }
 //-----------------------------------------------------------------------------
 int SERVER_INFO::PARSER::ParseStart(const char *el, const char **attr)
 {
 depth++;
 if (depth == 1)

+    {

     if (strcasecmp(el, "ServerInfo") == 0)
         parsingAnswer = true;
     if (strcasecmp(el, "ServerInfo") == 0)
         parsingAnswer = true;

+    }

 else
 else

+    {

     if (depth == 2 && parsingAnswer)
         if (!TryParse(propertyParsers, ToLower(el), attr))
             error = "Invalid parameter.";
     if (depth == 2 && parsingAnswer)
         if (!TryParse(propertyParsers, ToLower(el), attr))
             error = "Invalid parameter.";

+    }

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------


@@ -80,9 +83,3 @@ if (depth == 0 && parsingAnswer)
     parsingAnswer = false;
     }
 }
     parsingAnswer = false;
     }
 }

-//-----------------------------------------------------------------------------
-void SERVER_INFO::PARSER::SetCallback(CALLBACK f, void * d)
-{
-callback = f;
-data = d;
-}