Fixed compilaton errors.

diff --git a/stglibs/srvconf.lib/parsers/chg_corp.cpp b/stglibs/srvconf.lib/parsers/chg_corp.cpp
index daa54644801f7450511693e56d1fab30def6c8f2..852fe8e1b846a2ce2b7a46b5988fc4a5f15f0380 100644 (file)
--- 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;
 
 {
 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();
 }
 
 return stream.str();
 }

diff --git a/stglibs/srvconf.lib/parsers/chg_service.cpp b/stglibs/srvconf.lib/parsers/chg_service.cpp
index 7dac5ba9925eee29d3eb41d8a72171da684b2a82..6bea75653c9143da9ed90069fd44f86da5724061 100644 (file)
--- 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;
 
 {
 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();
 }
 
 return stream.str();
 }

diff --git a/stglibs/srvconf.lib/parsers/chg_tariff.cpp b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
index 8a1c56a414db3a444cb9596a0c046e1863561f5e..158e6f890642af0a744525691ea825774e429901 100644 (file)
--- 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;
 
 {
 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 << "<traffType value=\"" + TARIFF::TraffTypeToString(data.tariffConf.traffType.data()) + "\"/>";
 
 if (!data.tariffConf.traffType.empty())
     stream << "<traffType value=\"" + TARIFF::TraffTypeToString(data.tariffConf.traffType.data()) + "\"/>";

diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp
index f00279684990bbd04fa904207b02d3e2658a5bfb..e30392f36c038adc2b3da989679c097b3d33bc44 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_user.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_user.cpp
@@ -78,30 +78,30 @@ std::ostringstream stream;
 
 // Conf
 
 
 // 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.tariffName.data() << "\"/>";
 
 
 if (!conf.nextTariff.empty())
     stream << "<tariff delayed=\"" << conf.nextTariff.data() << "\"/>";
 else if (!conf.tariffName.empty())
     stream << "<tariff now=\"" << conf.tariffName.data() << "\"/>";
 

-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)
 
 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())
     {
 
 if (!conf.services.empty())
     {


@@ -118,7 +118,7 @@ if (!stat.cashAdd.empty())
 else if (!stat.cashSet.empty())
     stream << "<cash set=\"" << stat.cashSet.data().first << "\" msg=\"" << IconvString(Encode12str(stat.cashSet.data().second), encoding, "koi8-ru") << "\"/>";
 
 else if (!stat.cashSet.empty())
     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)
 
 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 6f98fc23fe2f5a04cf3d244a2584cde23ab0e45a..f6de8e513b5b86bb4ca74fb1e0179e1631b41320 100644 (file)
--- 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 == 1)
     ParseService(el, attr);
 

-if (depth == 2 && parsingAnswer)
-    ParseServiceParams(el, attr);
+/*if (depth == 2 && parsingAnswer)
+    ParseServiceParams(el, attr);*/

 
 return 0;
 }
 
 return 0;
 }


@@ -86,15 +86,25 @@ if (strcasecmp(el, "service") == 0)
                 error = "Service not found.";
             }
         else
                 error = "Service not found.";
             }
         else

+            {

             parsingAnswer = true;
             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;
     }
 }
 //-----------------------------------------------------------------------------
         }
     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.";
 {
 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 fe29ec09daaf463e0684991c7eebd99b9c21b0ab..d82136271745142d2fa71290deb997777e20123a 100644 (file)
--- 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);
     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
 };
 
 } // namespace GET_SERVICE