From be3d58dbca4e5aeb16c15983ca59a1db56b9fd7a Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 3 Oct 2014 12:02:30 +0300 Subject: [PATCH 1/1] Fixed compilaton errors. --- stglibs/srvconf.lib/parsers/chg_corp.cpp | 4 +-- stglibs/srvconf.lib/parsers/chg_service.cpp | 8 ++--- stglibs/srvconf.lib/parsers/chg_tariff.cpp | 6 ++-- stglibs/srvconf.lib/parsers/chg_user.cpp | 34 ++++++++++----------- stglibs/srvconf.lib/parsers/get_service.cpp | 18 ++++++++--- stglibs/srvconf.lib/parsers/get_service.h | 2 +- 6 files changed, 41 insertions(+), 31 deletions(-) diff --git a/stglibs/srvconf.lib/parsers/chg_corp.cpp b/stglibs/srvconf.lib/parsers/chg_corp.cpp index daa54644..852fe8e1 100644 --- a/stglibs/srvconf.lib/parsers/chg_corp.cpp +++ b/stglibs/srvconf.lib/parsers/chg_corp.cpp @@ -33,8 +33,8 @@ std::string CHG_CORP::Serialize(const CORP_CONF_RES & conf, const std::string & { std::ostringstream stream; -appendResetable(stream, "name", conf.name); -appendResetable(stream, "cash", conf.cash); +appendResetableTag(stream, "name", conf.name); +appendResetableTag(stream, "cash", conf.cash); return stream.str(); } diff --git a/stglibs/srvconf.lib/parsers/chg_service.cpp b/stglibs/srvconf.lib/parsers/chg_service.cpp index 7dac5ba9..6bea7565 100644 --- a/stglibs/srvconf.lib/parsers/chg_service.cpp +++ b/stglibs/srvconf.lib/parsers/chg_service.cpp @@ -33,10 +33,10 @@ std::string CHG_SERVICE::Serialize(const SERVICE_CONF_RES & conf, const std::str { std::ostringstream stream; -appendResetable(stream, "name", conf.name); -appendResetable(stream, "comment", MaybeEncode(conf.comment)); -appendResetable(stream, "cost", conf.cost); -appendResetable(stream, "payDay", conf.payDay); +appendResetableAttr(stream, "name", conf.name); +appendResetableAttr(stream, "comment", MaybeEncode(conf.comment)); +appendResetableAttr(stream, "cost", conf.cost); +appendResetableAttr(stream, "payDay", conf.payDay); return stream.str(); } diff --git a/stglibs/srvconf.lib/parsers/chg_tariff.cpp b/stglibs/srvconf.lib/parsers/chg_tariff.cpp index 8a1c56a4..158e6f89 100644 --- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp +++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp @@ -55,9 +55,9 @@ std::string CHG_TARIFF::Serialize(const TARIFF_DATA_RES & data, const std::strin { std::ostringstream stream; -appendResetable(stream, "fee", data.tariffConf.fee); -appendResetable(stream, "passiveCost", data.tariffConf.passiveCost); -appendResetable(stream, "free", data.tariffConf.free); +appendResetableTag(stream, "fee", data.tariffConf.fee); +appendResetableTag(stream, "passiveCost", data.tariffConf.passiveCost); +appendResetableTag(stream, "free", data.tariffConf.free); if (!data.tariffConf.traffType.empty()) stream << ""; diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp index f0027968..e30392f3 100644 --- a/stglibs/srvconf.lib/parsers/chg_user.cpp +++ b/stglibs/srvconf.lib/parsers/chg_user.cpp @@ -78,30 +78,30 @@ 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 << ""; else if (!conf.tariffName.empty()) stream << ""; -appendResetable(stream, "note", MaybeEncode(MaybeIconv(conf.note, encoding, "koi8-ru"))); -appendResetable(stream, "name", MaybeEncode(MaybeIconv(conf.realName, encoding, "koi8-ru"))); // TODO: name -> realName -appendResetable(stream, "address", MaybeEncode(MaybeIconv(conf.address, encoding, "koi8-ru"))); -appendResetable(stream, "email", MaybeEncode(MaybeIconv(conf.email, encoding, "koi8-ru"))); -appendResetable(stream, "phone", MaybeEncode(MaybeIconv(conf.phone, encoding, "cp1251"))); -appendResetable(stream, "group", MaybeEncode(MaybeIconv(conf.group, encoding, "koi8-ru"))); -appendResetable(stream, "corp", conf.corp); +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, MaybeEncode(MaybeIconv(conf.userdata[i], encoding, "koi8-ru"))); + appendResetableTag(stream, "userdata", i, MaybeEncode(MaybeIconv(conf.userdata[i], encoding, "koi8-ru"))); if (!conf.services.empty()) { @@ -118,7 +118,7 @@ if (!stat.cashAdd.empty()) else if (!stat.cashSet.empty()) stream << ""; -appendResetable(stream, "freeMb", stat.freeMb); +appendResetableTag(stream, "freeMb", stat.freeMb); std::ostringstream traff; for (size_t i = 0; i < stat.sessionUp.size(); ++i) diff --git a/stglibs/srvconf.lib/parsers/get_service.cpp b/stglibs/srvconf.lib/parsers/get_service.cpp index 6f98fc23..f6de8e51 100644 --- a/stglibs/srvconf.lib/parsers/get_service.cpp +++ b/stglibs/srvconf.lib/parsers/get_service.cpp @@ -54,8 +54,8 @@ depth++; if (depth == 1) ParseService(el, attr); -if (depth == 2 && parsingAnswer) - ParseServiceParams(el, attr); +/*if (depth == 2 && parsingAnswer) + ParseServiceParams(el, attr);*/ return 0; } @@ -86,15 +86,25 @@ if (strcasecmp(el, "service") == 0) error = "Service not found."; } else + { parsingAnswer = true; + for (const char ** pos = attr; *pos != NULL; pos = pos + 2) + if (!TryParse(propertyParsers, ToLower(*pos), pos, encoding, *pos)) + { + error = std::string("Invalid parameter '") + *pos + "' or value '" + *(pos + 1) + "'."; + break; + } + else + printfd(__FILE__, "Parsed '%s' successfully.\n", *pos); + } } else parsingAnswer = true; } } //----------------------------------------------------------------------------- -void GET_SERVICE::PARSER::ParseServiceParams(const char * el, const char ** attr) +/*void GET_SERVICE::PARSER::ParseServiceParams(const char * el, const char ** attr) { if (!TryParse(propertyParsers, ToLower(el), attr, encoding)) error = "Invalid parameter."; -} +}*/ diff --git a/stglibs/srvconf.lib/parsers/get_service.h b/stglibs/srvconf.lib/parsers/get_service.h index fe29ec09..d8213627 100644 --- a/stglibs/srvconf.lib/parsers/get_service.h +++ b/stglibs/srvconf.lib/parsers/get_service.h @@ -55,7 +55,7 @@ private: std::string error; void ParseService(const char * el, const char ** attr); - void ParseServiceParams(const char * el, const char ** attr); + //void ParseServiceParams(const char * el, const char ** attr); }; } // namespace GET_SERVICE -- 2.44.2