Rename tariff to tariffName

[stg.git] / projects / sgconf / config.h

diff --git a/projects/sgconf/config.h b/projects/sgconf/config.h
index 68aade1d18b4d931902586969d6bd87cfb457ebf..9ec9616eabebfc11ad40f6e5d8d30f0853fcf030 100644 (file)
--- a/projects/sgconf/config.h
+++ b/projects/sgconf/config.h
@@ -21,6 +21,7 @@
 #ifndef __STG_SGCONF_CONFIG_H__
 #define __STG_SGCONF_CONFIG_H__
 
 #ifndef __STG_SGCONF_CONFIG_H__
 #define __STG_SGCONF_CONFIG_H__
 

+#include "stg/common.h"

 #include "stg/resetable.h"
 #include "stg/os_int.h"
 
 #include "stg/resetable.h"
 #include "stg/os_int.h"
 


@@ -36,6 +37,39 @@ struct CONFIG
     RESETABLE<uint16_t> port;
     RESETABLE<std::string> userName;
     RESETABLE<std::string> userPass;
     RESETABLE<uint16_t> port;
     RESETABLE<std::string> userName;
     RESETABLE<std::string> userPass;

+
+    CONFIG & operator=(const CONFIG & rhs)
+    {
+    if (!rhs.configFile.empty())
+        configFile = rhs.configFile;
+    if (!rhs.server.empty())
+        server = rhs.server;
+    if (!rhs.port.empty())
+        port = rhs.port;
+    if (!rhs.userName.empty())
+        userName = rhs.userName;
+    if (!rhs.userPass.empty())
+        userPass = rhs.userPass;
+    return *this;
+    }
+
+    std::string Serialize() const
+    {
+    std::string res("{ ");
+    if (!configFile.empty())
+        res += "configFile: '" + configFile.data() + "'";
+    if (!server.empty())
+        res += ", server: '" + server.data() + "'";
+    if (!port.empty())
+        res += ", port: " + x2str(port.data());
+    if (!userName.empty())
+        res += ", userName: '" + userName.data() + "'";
+    if (!userPass.empty())
+        res += ", userPass: '" + userPass.data() + "'";
+    return res + " }";
+    }

 };
 
 }
 };
 
 }

+
+#endif