Removed unexpected printf from servconf library.

[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..e30392f36c038adc2b3da989679c097b3d33bc44 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_user.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_user.cpp
@@ -25,16 +25,19 @@
 
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
+#include "stg/common.h"
 
 #include <sstream>
+#include <iostream>
 
 #include <strings.h>
 
 using namespace STG;
 
-CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d)
+CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d, const std::string & e)
     : callback(f),
       data(d),
+      encoding(e),
       depth(0)
 {
 }
@@ -69,44 +72,53 @@ else
     callback(false, "Invalid response.", data);
 }
 
-std::string CHG_USER::Serialize(const USER_CONF_RES & conf, const USER_STAT_RES & stat)
+std::string CHG_USER::Serialize(const USER_CONF_RES & conf, const USER_STAT_RES & stat, const std::string & encoding)
 {
 std::ostringstream stream;
 
 // Conf
 
-appendResetable(stream, "credit", conf.credit);
-appendResetable(stream, "creditExpire", conf.creditExpire);
-appendResetable(stream, "password", conf.password);
-appendResetable(stream, "down", conf.disabled); // TODO: down -> disabled
-appendResetable(stream, "passive", conf.passive);
-appendResetable(stream, "disableDetailStat", conf.disabledDetailStat); // TODO: disable -> disabled
-appendResetable(stream, "aonline", conf.alwaysOnline); // TODO: aonline -> alwaysOnline
-appendResetable(stream, "ip", conf.ips); // TODO: ip -> ips
+appendResetableTag(stream, "credit", conf.credit);
+appendResetableTag(stream, "creditExpire", conf.creditExpire);
+appendResetableTag(stream, "password", conf.password);
+appendResetableTag(stream, "down", conf.disabled); // TODO: down -> disabled
+appendResetableTag(stream, "passive", conf.passive);
+appendResetableTag(stream, "disableDetailStat", conf.disabledDetailStat); // TODO: disable -> disabled
+appendResetableTag(stream, "aonline", conf.alwaysOnline); // TODO: aonline -> alwaysOnline
+appendResetableTag(stream, "ip", conf.ips); // TODO: ip -> ips
 
 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);
+appendResetableTag(stream, "note", MaybeEncode(MaybeIconv(conf.note, encoding, "koi8-ru")));
+appendResetableTag(stream, "name", MaybeEncode(MaybeIconv(conf.realName, encoding, "koi8-ru"))); // TODO: name -> realName
+appendResetableTag(stream, "address", MaybeEncode(MaybeIconv(conf.address, encoding, "koi8-ru")));
+appendResetableTag(stream, "email", MaybeEncode(MaybeIconv(conf.email, encoding, "koi8-ru")));
+appendResetableTag(stream, "phone", MaybeEncode(MaybeIconv(conf.phone, encoding, "cp1251")));
+appendResetableTag(stream, "group", MaybeEncode(MaybeIconv(conf.group, encoding, "koi8-ru")));
+appendResetableTag(stream, "corp", conf.corp);
 
 for (size_t i = 0; i < conf.userdata.size(); ++i)
-    appendResetable(stream, "userdata", i, conf.userdata[i]);
+    appendResetableTag(stream, "userdata", i, MaybeEncode(MaybeIconv(conf.userdata[i], encoding, "koi8-ru")));
+
+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())
-    stream << "<cash add=\"" << stat.cashAdd.data().first << "\" msg=\"" << stat.cashAdd.data().second << "\"/>";
+    stream << "<cash add=\"" << stat.cashAdd.data().first << "\" msg=\"" << IconvString(Encode12str(stat.cashAdd.data().second), encoding, "koi8-ru") << "\"/>";
 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=\"" << IconvString(Encode12str(stat.cashSet.data().second), encoding, "koi8-ru") << "\"/>";
 
-appendResetable(stream, "freeMb", stat.freeMb);
+appendResetableTag(stream, "freeMb", stat.freeMb);
 
 std::ostringstream traff;
 for (size_t i = 0; i < stat.sessionUp.size(); ++i)
@@ -126,5 +138,6 @@ std::string traffData = traff.str();
 if (!traffData.empty())
     stream << "<traff" << traffData << "/>";
 
+std::cerr << stream.str() << "\n";
 return stream.str();
 }