Lots of stylistic fixes.

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser_tariff.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
index 389e85750e28a50d725e9853f5fd60846319c3fc..a4531703c54de43765b319b3f6f22f1b015c1267 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
@@ -1,8 +1,8 @@
 #include <cstdio> // snprintf
 #include <cstring>
 
 #include <cstdio> // snprintf
 #include <cstring>
 

+#include "stg/tariffs.h"

 #include "parser.h"
 #include "parser.h"

-#include "tariffs.h"

 
 const int pt_mega = 1024 * 1024;
 //-----------------------------------------------------------------------------
 
 const int pt_mega = 1024 * 1024;
 //-----------------------------------------------------------------------------


@@ -29,7 +29,7 @@ return -1;
 //-----------------------------------------------------------------------------
 void PARSER_GET_TARIFFS::CreateAnswer()
 {
 //-----------------------------------------------------------------------------
 void PARSER_GET_TARIFFS::CreateAnswer()
 {

-string s;
+std::string s;

 char vs[100];
 int hd, hn, md, mn;
 
 char vs[100];
 int hd, hn, md, mn;
 


@@ -145,6 +145,8 @@ for (; it != dataList.end(); ++it)
             break;
         }
 
             break;
         }
 

+    answerList->push_back("<Period value=\"" + TARIFF::PeriodToString(it->tariffConf.period) + "\"/>");
+

     answerList->push_back("</tariff>");
     }
 answerList->push_back("</Tariffs>");
     answerList->push_back("</tariff>");
     }
 answerList->push_back("</Tariffs>");


@@ -186,7 +188,7 @@ if (tariffs->Add(tariffToAdd, currAdmin) == 0)
     }
 else
     {
     }
 else
     {

-    string s;
+    std::string s;

     strprintf(&s, "<AddTariff Result=\"Error. %s\"/>", tariffs->GetStrError().c_str());
     answerList->push_back(s);
     }
     strprintf(&s, "<AddTariff Result=\"Error. %s\"/>", tariffs->GetStrError().c_str());
     answerList->push_back(s);
     }


@@ -222,7 +224,7 @@ answerList->erase(answerList->begin(), answerList->end());
 
 if (users->TariffInUse(tariffToDel))
     {
 
 if (users->TariffInUse(tariffToDel))
     {

-    string s;
+    std::string s;

     strprintf(&s, "<DelTariff Result=\"Error. Tariff \'%s\' cannot be deleted. Tariff in use.\"/>", tariffToDel.c_str());
     answerList->push_back(s);
     return;
     strprintf(&s, "<DelTariff Result=\"Error. Tariff \'%s\' cannot be deleted. Tariff in use.\"/>", tariffToDel.c_str());
     answerList->push_back(s);
     return;


@@ -234,7 +236,7 @@ if (tariffs->Del(tariffToDel, currAdmin) == 0)
     }
 else
     {
     }
 else
     {

-    string s;
+    std::string s;

     strprintf(&s, "<DelTariff Result=\"Error. %s\"/>", tariffs->GetStrError().c_str());
     answerList->push_back(s);
     }
     strprintf(&s, "<DelTariff Result=\"Error. %s\"/>", tariffs->GetStrError().c_str());
     answerList->push_back(s);
     }


@@ -244,7 +246,7 @@ else
 //  CHG TARIFF
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 //  CHG TARIFF
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-int PARSER_CHG_TARIFF::ParseSlashedIntParams(int paramsNum, const string & s, int * params)
+int PARSER_CHG_TARIFF::ParseSlashedIntParams(int paramsNum, const std::string & s, int * params)

 {
 char * str = new char[s.size() + 1];
 char * p;
 {
 char * str = new char[s.size() + 1];
 char * p;


@@ -272,7 +274,7 @@ delete[] str;
 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int PARSER_CHG_TARIFF::ParseSlashedDoubleParams(int paramsNum, const string & s, double * params)
+int PARSER_CHG_TARIFF::ParseSlashedDoubleParams(int paramsNum, const std::string & s, double * params)

 {
 char * str = new char[s.size() + 1];
 char * p;
 {
 char * str = new char[s.size() + 1];
 char * p;


@@ -302,7 +304,6 @@ return 0;
 //-----------------------------------------------------------------------------
 int PARSER_CHG_TARIFF::ParseStart(void *, const char * el, const char ** attr)
 {
 //-----------------------------------------------------------------------------
 int PARSER_CHG_TARIFF::ParseStart(void *, const char * el, const char ** attr)
 {

-char st[50];

 double price[DIR_NUM];
 int t[DIR_NUM];
 depth++;
 double price[DIR_NUM];
 int t[DIR_NUM];
 depth++;


@@ -317,7 +318,7 @@ if (depth == 1)
     }
 else
     {
     }
 else
     {

-    string s;
+    std::string s;

 
     if (strcasecmp(el, "PriceDayA") == 0)
         {
 
     if (strcasecmp(el, "PriceDayA") == 0)
         {


@@ -385,6 +386,7 @@ else
 
     for (int j = 0; j < DIR_NUM; j++)
         {
 
     for (int j = 0; j < DIR_NUM; j++)
         {

+        char st[50];

         snprintf(st, 50, "Time%d", j);
         if (strcasecmp(el, st) == 0)
             {
         snprintf(st, 50, "Time%d", j);
         if (strcasecmp(el, st) == 0)
             {


@@ -451,6 +453,12 @@ else
             }
         return 0;
         }
             }
         return 0;
         }

+
+    if (strcasecmp(el, "Period") == 0)
+        {
+        td.tariffConf.period = TARIFF::StringToPeriod(attr[1]);
+        return 0;
+        }

     }
 return -1;
 }
     }
 return -1;
 }


@@ -485,7 +493,7 @@ if (!td.tariffConf.name.data().empty())
         }
     else
         {
         }
     else
         {

-        string s;
+        std::string s;

         strprintf(&s, "<SetTariff Result=\"Change tariff error! %s\"/>", tariffs->GetStrError().c_str());
         answerList->push_back(s);
         return;
         strprintf(&s, "<SetTariff Result=\"Change tariff error! %s\"/>", tariffs->GetStrError().c_str());
         answerList->push_back(s);
         return;