Fixed error handling in SetUser.

[stg.git] / stglibs / srvconf.lib / parser_get_user.cpp

diff --git a/stglibs/srvconf.lib/parser_get_user.cpp b/stglibs/srvconf.lib/parser_get_user.cpp
index 9af85d03e8b32a4b71e47501842163ee5d1db668..1039cb8d842ab08174b6d371ae054950bef44b15 100644 (file)
--- a/stglibs/srvconf.lib/parser_get_user.cpp
+++ b/stglibs/srvconf.lib/parser_get_user.cpp
@@ -23,6 +23,7 @@
 
 #include "stg/common.h"
 
 
 #include "stg/common.h"
 

+#include <utility>

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


@@ -58,56 +59,58 @@ double getValue<double>(const char ** attr)
 {
 double value = 0;
 if (checkValue(attr))
 {
 double value = 0;
 if (checkValue(attr))

-    if (strtodouble2(attr[1], value) == EINVAL)
+    if (strtodouble2(attr[1], value))

         return 0;
 return value;
 }
 
 template <>
         return 0;
 return value;
 }
 
 template <>

-STAT getValue<STAT>(const char ** attr)
+PARSER_GET_USER::STAT getValue<PARSER_GET_USER::STAT>(const char ** attr)

 {
 {

-STAT value;
+PARSER_GET_USER::STAT value;

 if (!attr)
     return value;
 if (!attr)
     return value;

-std::map<std::string, long long &> props;
+std::map<std::string, long long *> props;

 for (size_t i = 0; i < DIR_NUM; ++i)
     {
 for (size_t i = 0; i < DIR_NUM; ++i)
     {

-    props.insert("su" + x2str(i), value.su[i]);
-    props.insert("sd" + x2str(i), value.sd[i]);
-    props.insert("mu" + x2str(i), value.mu[i]);
-    props.insert("md" + x2str(i), value.md[i]);
+    props.insert(std::pair<std::string, long long *>("su" + x2str(i), &value.su[i]));
+    props.insert(std::pair<std::string, long long *>("sd" + x2str(i), &value.sd[i]));
+    props.insert(std::pair<std::string, long long *>("mu" + x2str(i), &value.mu[i]));
+    props.insert(std::pair<std::string, long long *>("md" + x2str(i), &value.md[i]));

     }
 size_t pos = 0;
 while (attr[pos])
     {
         std::string name(ToLower(attr[pos++]));
     }
 size_t pos = 0;
 while (attr[pos])
     {
         std::string name(ToLower(attr[pos++]));

-        std::map<std::string, long long &>::iterator it(props.find(name));
+        std::map<std::string, long long *>::iterator it(props.find(name));

         if (it != props.end())
         if (it != props.end())

-            str2x(attr[pos++], it->second);
+            str2x(attr[pos++], *it->second);

     }
 return value;
 }
 
 std::string getEncodedValue(const char ** attr)
 {
     }
 return value;
 }
 
 std::string getEncodedValue(const char ** attr)
 {

+std::string value;

 if (checkValue(attr))
 if (checkValue(attr))

-    return Decode21str(attr[1]);
-return "";
+    Decode21str(value, attr[1]);
+return value;

 }
 
 }
 

-template <typename T>
-void addParser(PROPERTY_PARSERS & parsers, const std::string & name, T & value, bool /*encoded*/)
+uint32_t getIPValue(const char ** attr)

 {
 {

-    parsers.insert(ToLower(name), new PROPERTY_PARSER(value, getValue<T>));
+if (checkValue(attr))
+    return inet_strington(attr[1]);
+return 0;

 }
 
 }
 

-template <>
-void addParser<std::string>(PROPERTY_PARSERS & parsers, const std::string & name, std::string & value, bool encoded)
+template <typename T>
+void addParser(PROPERTY_PARSERS & parsers, const std::string & name, T & value, const typename PROPERTY_PARSER<T>::FUNC & func = getValue<T>);
+
+template <typename T>
+void addParser(PROPERTY_PARSERS & parsers, const std::string & name, T & value, const typename PROPERTY_PARSER<T>::FUNC & func)

 {
 {

-    if (encoded)
-        parsers.insert(ToLower(name), new PROPERTY_PARSER(value, getEncodedValue));
-    else
-        parsers.insert(ToLower(name), new PROPERTY_PARSER(value, getValue<T>));
+    parsers.insert(std::make_pair(ToLower(name), new PROPERTY_PARSER<T>(value, func)));

 }
 
 void tryParse(PROPERTY_PARSERS & parsers, const std::string & name, const char ** attr)
 }
 
 void tryParse(PROPERTY_PARSERS & parsers, const std::string & name, const char ** attr)


@@ -136,19 +139,19 @@ PARSER_GET_USER::PARSER_GET_USER()
     addParser(propertyParsers, "disableDetailStat", info.disableDetailStat);
     addParser(propertyParsers, "connected", info.connected);
     addParser(propertyParsers, "alwaysOnline", info.alwaysOnline);
     addParser(propertyParsers, "disableDetailStat", info.disableDetailStat);
     addParser(propertyParsers, "connected", info.connected);
     addParser(propertyParsers, "alwaysOnline", info.alwaysOnline);

-    addParser(propertyParsers, "ip", info.ip);
-    addParser(propertyParsers, "ips", info.ips);
+    addParser(propertyParsers, "currIP", info.ip, getIPValue);
+    addParser(propertyParsers, "ip", info.ips);

     addParser(propertyParsers, "tariff", info.tariff);
     addParser(propertyParsers, "tariff", info.tariff);

-    addParser(propertyParsers, "group", info.group, true);
-    addParser(propertyParsers, "note", info.note, true);
-    addParser(propertyParsers, "email", info.email, true);
-    addParser(propertyParsers, "name", info.name, true);
-    addParser(propertyParsers, "address", info.address, true);
-    addParser(propertyParsers, "phone", info.phone, true);
+    addParser(propertyParsers, "group", info.group, getEncodedValue);
+    addParser(propertyParsers, "note", info.note, getEncodedValue);
+    addParser(propertyParsers, "email", info.email, getEncodedValue);
+    addParser(propertyParsers, "name", info.name, getEncodedValue);
+    addParser(propertyParsers, "address", info.address, getEncodedValue);
+    addParser(propertyParsers, "phone", info.phone, getEncodedValue);

     addParser(propertyParsers, "traff", info.stat);
 
     for (size_t i = 0; i < USERDATA_NUM; ++i)
     addParser(propertyParsers, "traff", info.stat);
 
     for (size_t i = 0; i < USERDATA_NUM; ++i)

-        addParser(propertyParsers, "userData" + x2str(i), info.userData[i], true);
+        addParser(propertyParsers, "userData" + x2str(i), info.userData[i], getEncodedValue);

 }
 //-----------------------------------------------------------------------------
 PARSER_GET_USER::~PARSER_GET_USER()
 }
 //-----------------------------------------------------------------------------
 PARSER_GET_USER::~PARSER_GET_USER()


@@ -182,7 +185,7 @@ void PARSER_GET_USER::ParseUser(const char * el, const char ** attr)
 {
 if (strcasecmp(el, "user") == 0)
     if (strcasecmp(attr[1], "error") == 0)
 {
 if (strcasecmp(el, "user") == 0)
     if (strcasecmp(attr[1], "error") == 0)

-        user.login = "";
+        info.login = "";

 }
 //-----------------------------------------------------------------------------
 void PARSER_GET_USER::ParseUserParams(const char * el, const char ** attr)
 }
 //-----------------------------------------------------------------------------
 void PARSER_GET_USER::ParseUserParams(const char * el, const char ** attr)