Fixed processing of coma-separated lists.

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

diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp
index ed2002bcf78b55065ccaff4556916b287efa1684..01361d08fb076312837002b95675c3204d4ae096 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_user.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_user.cpp
@@ -25,13 +25,28 @@
 
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"

+#include "stg/common.h"

 
 #include <sstream>
 
 #include <sstream>

+#include <iostream>

 
 #include <strings.h>
 
 using namespace STG;
 
 
 #include <strings.h>
 
 using namespace STG;
 

+namespace
+{
+
+RESETABLE<std::string> MaybeEncode(const RESETABLE<std::string> & value)
+{
+RESETABLE<std::string> res;
+if (!value.empty())
+    res = Encode12str(value.data());
+return res;
+}
+
+}
+

 CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d)
     : callback(f),
       data(d),
 CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d)
     : callback(f),
       data(d),


@@ -87,24 +102,33 @@ appendResetable(stream, "ip", conf.ips); // TODO: ip -> ips
 if (!conf.nextTariff.empty())
     stream << "<tariff delayed=\"" << conf.nextTariff.data() << "\"/>";
 else if (!conf.tariffName.empty())
 if (!conf.nextTariff.empty())
     stream << "<tariff delayed=\"" << conf.nextTariff.data() << "\"/>";
 else if (!conf.tariffName.empty())

-    stream << "<tariff now=\"" << conf.nextTariff.data() << "\"/>";
+    stream << "<tariff now=\"" << conf.tariffName.data() << "\"/>";

 
 

-appendResetable(stream, "note", conf.note);
-appendResetable(stream, "name", conf.realName); // TODO: name -> realName
-appendResetable(stream, "address", conf.address);
-appendResetable(stream, "email", conf.email);
-appendResetable(stream, "phone", conf.phone);
-appendResetable(stream, "group", conf.group);
+appendResetable(stream, "note", MaybeEncode(conf.note));
+appendResetable(stream, "name", MaybeEncode(conf.realName)); // TODO: name -> realName
+appendResetable(stream, "address", MaybeEncode(conf.address));
+appendResetable(stream, "email", MaybeEncode(conf.email));
+appendResetable(stream, "phone", MaybeEncode(conf.phone));
+appendResetable(stream, "group", MaybeEncode(conf.group));
+appendResetable(stream, "corp", conf.group);

 
 for (size_t i = 0; i < conf.userdata.size(); ++i)
 
 for (size_t i = 0; i < conf.userdata.size(); ++i)

-    appendResetable(stream, "userdata", i, conf.userdata[i]);
+    appendResetable(stream, "userdata", i, MaybeEncode(conf.userdata[i]));
+
+if (!conf.services.empty())
+    {
+    stream << "<services>";
+    for (size_t i = 0; i < conf.services.data().size(); ++i)
+        stream << "<service name=\"" << conf.services.data()[i] << "\"/>";
+    stream << "</services>";
+    }

 
 // Stat
 
 if (!stat.cashAdd.empty())
 
 // Stat
 
 if (!stat.cashAdd.empty())

-    stream << "<cash add=\"" << stat.cashAdd.data().first << "\" msg=\"" << stat.cashAdd.data().second << "\"/>";
+    stream << "<cash add=\"" << stat.cashAdd.data().first << "\" msg=\"" << Encode12str(stat.cashAdd.data().second) << "\"/>";

 else if (!stat.cashSet.empty())
 else if (!stat.cashSet.empty())

-    stream << "<cash set=\"" << stat.cashAdd.data().first << "\" msg=\"" << stat.cashAdd.data().second << "\"/>";
+    stream << "<cash set=\"" << stat.cashSet.data().first << "\" msg=\"" << Encode12str(stat.cashSet.data().second) << "\"/>";

 
 appendResetable(stream, "freeMb", stat.freeMb);
 
 
 appendResetable(stream, "freeMb", stat.freeMb);
 


@@ -126,5 +150,6 @@ std::string traffData = traff.str();
 if (!traffData.empty())
     stream << "<traff" << traffData << "/>";
 
 if (!traffData.empty())
     stream << "<traff" << traffData << "/>";
 

+std::cerr << stream.str() << "\n";

 return stream.str();
 }
 return stream.str();
 }