From 1a21bad6c7e114808ad31d526fd5f12040afb467 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 29 May 2014 22:00:32 +0300 Subject: [PATCH] Added encoding of some strings. --- include/stg/user_conf.h | 9 ++--- projects/sgconf/users.cpp | 38 +++++++++++++++++---- stglibs/srvconf.lib/parsers/chg_user.cpp | 43 +++++++++++++++++++----- 3 files changed, 69 insertions(+), 21 deletions(-) diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h index d5acb238..fe458211 100644 --- a/include/stg/user_conf.h +++ b/include/stg/user_conf.h @@ -104,8 +104,7 @@ struct USER_CONF_RES credit = uc.credit; nextTariff = uc.nextTariff; for (size_t i = 0; i < USERDATA_NUM; i++) userdata[i] = uc.userdata[i]; - services.resize(uc.services.size()); - for (size_t i = 0; i < uc.services.size(); ++i) services[i] = uc.services[i]; + services = uc.services; creditExpire = uc.creditExpire; ips = uc.ips; return *this; @@ -132,9 +131,7 @@ struct USER_CONF_RES { uc.userdata[i] = userdata[i].data(); } - uc.services.resize(services.size()); - for (size_t i = 0; i < services.size(); ++i) - uc.services[i] = services[i].data(); + uc.services = services.data(); uc.creditExpire = creditExpire.data(); uc.ips = ips.data(); return uc; @@ -157,7 +154,7 @@ struct USER_CONF_RES RESETABLE credit; RESETABLE nextTariff; std::vector > userdata; - std::vector > services; + RESETABLE > services; RESETABLE creditExpire; RESETABLE ips; }; diff --git a/projects/sgconf/users.cpp b/projects/sgconf/users.cpp index 773ebbbb..9331d651 100644 --- a/projects/sgconf/users.cpp +++ b/projects/sgconf/users.cpp @@ -84,7 +84,8 @@ std::vector GetUserParams() { std::vector params; params.push_back(SGCONF::API_ACTION::PARAM("password", "", "\tuser's password")); -params.push_back(SGCONF::API_ACTION::PARAM("cash", "", "\t\tuser's cash")); +params.push_back(SGCONF::API_ACTION::PARAM("cash-add", "", "cash to add (with optional comment)")); +params.push_back(SGCONF::API_ACTION::PARAM("cash-set", "", "cash to set (with optional comment)")); params.push_back(SGCONF::API_ACTION::PARAM("credit", "", "\tuser's credit")); params.push_back(SGCONF::API_ACTION::PARAM("credit-expire", "", "\tcredit expiration")); params.push_back(SGCONF::API_ACTION::PARAM("free", "", "\tprepaid traffic")); @@ -101,7 +102,7 @@ params.push_back(SGCONF::API_ACTION::PARAM("email", "", "\t\tuser's email params.push_back(SGCONF::API_ACTION::PARAM("name", "", "\tuser's real name")); params.push_back(SGCONF::API_ACTION::PARAM("address", "
", "\tuser's postal address")); params.push_back(SGCONF::API_ACTION::PARAM("phone", "", "\t\tuser's phone number")); -params.push_back(SGCONF::API_ACTION::PARAM("corp", "", "\t\tcorporation name")); +params.push_back(SGCONF::API_ACTION::PARAM("corp", "", "\tcorporation name")); params.push_back(SGCONF::API_ACTION::PARAM("session-traffic", "", "coma-separated session upload and download")); params.push_back(SGCONF::API_ACTION::PARAM("month-traffic", "", "coma-separated month upload and download")); params.push_back(SGCONF::API_ACTION::PARAM("user-data", "", "coma-separated user data values")); @@ -145,6 +146,12 @@ value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); Splice(res, Split > >(value, ',', ConvString)); } +void ConvServices(std::string value, RESETABLE > & res) +{ +value.erase(std::remove(value.begin(), value.end(), ' '), value.end()); +res = Split >(value, ','); +} + void ConvCreditExpire(const std::string & value, RESETABLE & res) { struct tm brokenTime; @@ -204,6 +211,24 @@ for (size_t i = 0; i < DIR_NUM; ++i) } } +void ConvCashInfo(const std::string & value, RESETABLE & res) +{ +CASH_INFO info; +size_t pos = value.find_first_of(':'); +if (pos == std::string::npos) + { + if (str2x(value, info.first) < 0) + throw SGCONF::ACTION::ERROR("Cash should be a double value. Got: '" + value + "'"); + } +else + { + if (str2x(value.substr(0, pos), info.first) < 0) + throw SGCONF::ACTION::ERROR("Cash should be a double value. Got: '" + value + "'"); + info.second = value.substr(pos + 1); + } +res = info; +} + void SimpleCallback(bool result, const std::string & reason, void * /*data*/) @@ -294,14 +319,14 @@ SGCONF::MaybeSet(options, "email", conf.email); SGCONF::MaybeSet(options, "note", conf.note); SGCONF::MaybeSet(options, "name", conf.realName); SGCONF::MaybeSet(options, "corp", conf.corp); -SGCONF::MaybeSet(options, "services", conf.services, ConvStringList); +SGCONF::MaybeSet(options, "services", conf.services, ConvServices); SGCONF::MaybeSet(options, "group", conf.group); SGCONF::MaybeSet(options, "next-tariff", conf.nextTariff); SGCONF::MaybeSet(options, "user-data", conf.userdata, ConvStringList); SGCONF::MaybeSet(options, "credit-expire", conf.creditExpire, ConvCreditExpire); SGCONF::MaybeSet(options, "ips", conf.ips, ConvIPs); USER_STAT_RES stat; -SGCONF::MaybeSet(options, "cash", stat.cash); +SGCONF::MaybeSet(options, "cash-set", stat.cashSet, ConvCashInfo); SGCONF::MaybeSet(options, "free", stat.freeMb); SGCONF::MaybeSet(options, "session-traffic", stat, ConvSessionTraff); SGCONF::MaybeSet(options, "month-traffic", stat, ConvMonthTraff); @@ -329,14 +354,15 @@ SGCONF::MaybeSet(options, "email", conf.email); SGCONF::MaybeSet(options, "note", conf.note); SGCONF::MaybeSet(options, "name", conf.realName); SGCONF::MaybeSet(options, "corp", conf.corp); -SGCONF::MaybeSet(options, "services", conf.services, ConvStringList); +SGCONF::MaybeSet(options, "services", conf.services, ConvServices); SGCONF::MaybeSet(options, "group", conf.group); SGCONF::MaybeSet(options, "next-tariff", conf.nextTariff); SGCONF::MaybeSet(options, "user-data", conf.userdata, ConvStringList); SGCONF::MaybeSet(options, "credit-expire", conf.creditExpire, ConvCreditExpire); SGCONF::MaybeSet(options, "ips", conf.ips, ConvIPs); USER_STAT_RES stat; -SGCONF::MaybeSet(options, "cash", stat.cash); +SGCONF::MaybeSet(options, "cash-add", stat.cashAdd, ConvCashInfo); +SGCONF::MaybeSet(options, "cash-set", stat.cashSet, ConvCashInfo); SGCONF::MaybeSet(options, "free", stat.freeMb); SGCONF::MaybeSet(options, "session-traffic", stat, ConvSessionTraff); SGCONF::MaybeSet(options, "month-traffic", stat, ConvMonthTraff); diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp index ed2002bc..73eddfd2 100644 --- 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/common.h" #include +#include #include using namespace STG; +namespace +{ + +RESETABLE MaybeEncode(const RESETABLE & value) +{ +RESETABLE res; +if (!value.empty()) + res = Encode12str(value.data()); +return res; +} + +} + CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d) : callback(f), data(d), @@ -89,22 +104,31 @@ if (!conf.nextTariff.empty()) else if (!conf.tariffName.empty()) stream << ""; -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) - appendResetable(stream, "userdata", i, conf.userdata[i]); + appendResetable(stream, "userdata", i, MaybeEncode(conf.userdata[i])); + +if (!conf.services.empty()) + { + stream << ""; + for (size_t i = 0; i < conf.services.data().size(); ++i) + stream << ""; + stream << ""; + } // Stat if (!stat.cashAdd.empty()) - stream << ""; + stream << ""; else if (!stat.cashSet.empty()) - stream << ""; + stream << ""; appendResetable(stream, "freeMb", stat.freeMb); @@ -126,5 +150,6 @@ std::string traffData = traff.str(); if (!traffData.empty()) stream << ""; +std::cerr << stream.str() << "\n"; return stream.str(); } -- 2.44.2