From: Naffanya <naffanya@naffanya.(none)>
Date: Sun, 28 Jul 2013 18:10:38 +0000 (+0300)
Subject: Correcting data conversion in GetParamValue
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/7f4a67cabd5fbf8cfe9c2e658bd4a255a6764b0e?ds=sidebyside

Correcting data conversion in GetParamValue
---

diff --git a/include/stg/user_property.h b/include/stg/user_property.h
index 2ff8909c..d76326f1 100644
--- a/include/stg/user_property.h
+++ b/include/stg/user_property.h
@@ -51,6 +51,7 @@ public:
     time_t  ModificationTime() const throw() { return modificationTime; }
     void    ModifyTime() throw();
 
+    std::string ToString() const;
 private:
     varT & value;
     time_t modificationTime;
@@ -382,5 +383,12 @@ std::ostream & operator<< (std::ostream & stream, const USER_PROPERTY<varT> & va
 return stream << value.ConstData();
 }
 //-----------------------------------------------------------------------------
-
+template<typename varT>
+std::string USER_PROPERTY<varT>::ToString() const
+{
+std::stringstream stream;
+stream << value;
+std::string stringValue = stream.str();
+return stringValue;
+}
 #endif // USER_PROPERTY_H
diff --git a/projects/stargazer/user_impl.cpp b/projects/stargazer/user_impl.cpp
index 55b5ffe7..1af2b4de 100644
--- a/projects/stargazer/user_impl.cpp
+++ b/projects/stargazer/user_impl.cpp
@@ -1465,116 +1465,118 @@ while (it != messages.end())
 }
 //-----------------------------------------------------------------------------
 std::string USER_IMPL::GetParamValue(const std::string & name) const
+{
+if (name == "cash")
     {
-    if (name == "cash")
-        {
-        return static_cast<std::string>(property.cash);
-        }
-    if (name == "freeMb")
-        {
-        return static_cast<std::string>(property.freeMb);
-        }
-    if (name == "passive")
-        {
-        return static_cast<std::string>(property.passive);
-        }
-    if (name == "disabled")
-        {
-        return static_cast<std::string>(property.disabled);
-        }
-    if (name == "alwaysOnline")
-        {
-        return static_cast<std::string>(property.alwaysOnline);
-        }
-    if (name == "tariffName")
-        {
-        return property.tariffName;
-        }
-    if (name == "nextTariff")
-        {
-        return property.nextTariff;
-        }
-    if (name == "address")
-        {
-        return property.address;
-        }
-    if (name == "note")
-        {
-        return property.note;
-        }
-    if (name == "group")
-        {
-        return property.group;
-        }
-    if (name == "email")
-        {
-        return property.email;
-        }
-    if (name == "phone")
-        {
-        return property.phone;
-        }
-    if (name == "realName")
-        {
-        return property.realName;
-        }
-    if (name == "credit")
-        {
-        return static_cast<std::string>(property.credit);
-        }
-    if (name == "userdata0")
-        {
-        return property.userdata0;
-        }
-    if (name == "userdata1")
-        {
-        return property.userdata1;
-        }
-    if (name == "userdata2")
-        {
-        return property.userdata2;
-        }
-    if (name == "userdata3")
-        {
-        return property.userdata3;
-        }
-    if (name == "userdata4")
-        {
-        return property.userdata4;
-        }
-    if (name == "userdata5")
-        {
-        return property.userdata5;
-        }
-    if (name == "userdata6")
-        {
-        return property.userdata6;
-        }
-    if (name == "userdata7")
-        {
-        return property.userdata7;
-        }
-    if (name == "userdata8")
-        {
-        return property.userdata8;
-        }
-    if (name == "userdata9")
-        {
-        return property.userdata9;
-        }
-    if (name == "id")
-        {
-        return static_cast<std::string>(id);
-        }
-    if (name == "login")
-        {
-        return login;
-        }
-    if (name == "ip")
-        {
-        return static_cast<std::string>(currIP);
-        }
+    return property.cash.ToString();
+    }
+if (name == "freeMb")
+    {
+    return property.freeMb.ToString();
+    }
+if (name == "passive")
+    {
+    return property.passive.ToString();
+    }
+if (name == "disabled")
+    {
+    return property.disabled.ToString();
+    }
+if (name == "alwaysOnline")
+    {
+    return property.alwaysOnline.ToString();
+    }
+if (name == "tariffName")
+    {
+    return property.tariffName;
+    }
+if (name == "nextTariff")
+    {
+    return property.nextTariff;
+    }
+if (name == "address")
+    {
+    return property.address;
+    }
+if (name == "note")
+    {
+    return property.note;
+    }
+if (name == "group")
+    {
+    return property.group;
+    }
+if (name == "email")
+    {
+    return property.email;
+    }
+if (name == "phone")
+    {
+    return property.phone;
+    }
+if (name == "realName")
+    {
+    return property.realName;
+    }
+if (name == "credit")
+    {
+    return property.credit.ToString();
     }
+if (name == "userdata0")
+    {
+    return property.userdata0;
+    }
+if (name == "userdata1")
+    {
+    return property.userdata1;
+    }
+if (name == "userdata2")
+    {
+    return property.userdata2;
+    }
+if (name == "userdata3")
+    {
+    return property.userdata3;
+    }
+if (name == "userdata4")
+    {
+    return property.userdata4;
+    }
+if (name == "userdata5")
+    {
+    return property.userdata5;
+    }
+if (name == "userdata6")
+    {
+    return property.userdata6;
+    }
+if (name == "userdata7")
+    {
+    return property.userdata7;
+    }
+if (name == "userdata8")
+    {
+    return property.userdata8;
+    }
+if (name == "userdata9")
+    {
+    return property.userdata9;
+    }
+if (name == "id")
+    {
+    std::stringstream stream;
+    stream << id;
+    return stream.str();;
+    }
+if (name == "login")
+    {
+    return login;
+    }
+if (name == "ip")
+    {
+    return currIP.ToString();
+    }
+}
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------