Added encoding of some strings.

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

diff --git a/stglibs/srvconf.lib/parsers/get_user.cpp b/stglibs/srvconf.lib/parsers/get_user.cpp
index a851e38077ec16b22e25036461e9b08afca6177b..7168c3482385ec6c00fc5e7a50c977a2f01103cb 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_user.cpp
+++ b/stglibs/srvconf.lib/parsers/get_user.cpp
@@ -88,6 +88,7 @@ GET_USER::PARSER::PARSER(CALLBACK f, void * d)
     AddParser(propertyParsers, "name", info.name, GetEncodedValue);
     AddParser(propertyParsers, "address", info.address, GetEncodedValue);
     AddParser(propertyParsers, "phone", info.phone, GetEncodedValue);
     AddParser(propertyParsers, "name", info.name, GetEncodedValue);
     AddParser(propertyParsers, "address", info.address, GetEncodedValue);
     AddParser(propertyParsers, "phone", info.phone, GetEncodedValue);

+    AddParser(propertyParsers, "corp", info.corp);

     AddParser(propertyParsers, "traff", info.stat);
     AddParser(propertyParsers, "pingTime", info.pingTime);
     AddParser(propertyParsers, "lastActivityTime", info.lastActivityTime);
     AddParser(propertyParsers, "traff", info.stat);
     AddParser(propertyParsers, "pingTime", info.pingTime);
     AddParser(propertyParsers, "lastActivityTime", info.lastActivityTime);


@@ -113,7 +114,10 @@ if (depth == 2 && parsingAnswer)
     ParseUserParams(el, attr);
 
 if (depth == 3 && parsingAnswer)
     ParseUserParams(el, attr);
 
 if (depth == 3 && parsingAnswer)

+    {

     ParseAuthBy(el, attr);
     ParseAuthBy(el, attr);

+    ParseServices(el, attr);
+    }

 
 return 0;
 }
 
 return 0;
 }


@@ -155,6 +159,9 @@ void GET_USER::PARSER::ParseUserParams(const char * el, const char ** attr)
 if (strcasecmp(el, "AuthorizedBy") != 0 &&
     !TryParse(propertyParsers, ToLower(el), attr))
     error = "Invalid parameter.";
 if (strcasecmp(el, "AuthorizedBy") != 0 &&
     !TryParse(propertyParsers, ToLower(el), attr))
     error = "Invalid parameter.";

+else if (strcasecmp(el, "Services") != 0 &&
+    !TryParse(propertyParsers, ToLower(el), attr))
+    error = "Invalid parameter.";

 }
 //-----------------------------------------------------------------------------
 void GET_USER::PARSER::ParseAuthBy(const char * el, const char ** attr)
 }
 //-----------------------------------------------------------------------------
 void GET_USER::PARSER::ParseAuthBy(const char * el, const char ** attr)


@@ -163,6 +170,12 @@ if (strcasecmp(el, "Auth") == 0 &&
     attr && attr[0] && attr[1] &&
     strcasecmp(attr[0], "name") == 0)
     info.authBy.push_back(attr[1]);
     attr && attr[0] && attr[1] &&
     strcasecmp(attr[0], "name") == 0)
     info.authBy.push_back(attr[1]);

-else
-    error = "Invalid auth description.";
+}
+//-----------------------------------------------------------------------------
+void GET_USER::PARSER::ParseServices(const char * el, const char ** attr)
+{
+if (strcasecmp(el, "Service") == 0 &&
+    attr && attr[0] && attr[1] &&
+    strcasecmp(attr[0], "name") == 0)
+    info.services.push_back(attr[1]);

 }
 }