#include "stg/common.h"
#include <cstdio> // sprintf
-#include <cstddef>
#include <strings.h>
using namespace STG;
-namespace
-{
-
-const size_t UNAME_LEN = 256;
-const size_t SERV_VER_LEN = 64;
-const size_t DIRNAME_LEN = 16;
-
-}
-
-SERVER_INFO::PARSER::PARSER()
- : callback(NULL),
- data(NULL),
+SERVER_INFO::PARSER::PARSER(CALLBACK f, void * d, const std::string & e)
+ : callback(f),
+ data(d),
+ encoding(e),
depth(0),
parsingAnswer(false)
{
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)
- if (strcasecmp(el, "ServerInfo") == 0)
+ {
+ if (strcasecmp(el, "GetServerInfo") == 0)
parsingAnswer = true;
+ }
else
+ {
if (depth == 2 && parsingAnswer)
- if (!TryParse(propertyParsers, ToLower(el), attr))
+ if (!TryParse(propertyParsers, ToLower(el), attr, encoding))
error = "Invalid parameter.";
+ }
return 0;
}
//-----------------------------------------------------------------------------
parsingAnswer = false;
}
}
-//-----------------------------------------------------------------------------
-void SERVER_INFO::PARSER::SetCallback(CALLBACK f, void * d)
-{
-callback = f;
-data = d;
-}