Merge branch 'fix-gts-auth-errors'

[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 e3b265206405c2e8a63942c9366d70bd3eed3703..7be1af9645a0107ff39a0ec839e45780f1817b08 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_tariff.cpp
@@ -1,6 +1,7 @@
 #include <cstdio> // snprintf
 #include <cstring>
 
 #include <cstdio> // snprintf
 #include <cstring>
 

+#include "stg/tariffs.h"

 #include "parser.h"
 
 const int pt_mega = 1024 * 1024;
 #include "parser.h"
 
 const int pt_mega = 1024 * 1024;


@@ -28,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;
 


@@ -185,7 +186,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);
     }


@@ -221,7 +222,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;


@@ -233,7 +234,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);
     }


@@ -243,7 +244,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;


@@ -271,7 +272,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;


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

-    string s;
+    std::string s;

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


@@ -387,7 +388,10 @@ else
         snprintf(st, 50, "Time%d", j);
         if (strcasecmp(el, st) == 0)
             {
         snprintf(st, 50, "Time%d", j);
         if (strcasecmp(el, st) == 0)
             {

-            int h1, m1, h2, m2;
+            int h1 = 0;
+            int m1 = 0;
+            int h2 = 0;
+            int m2 = 0;

             if (ParseTariffTimeStr(attr[1], h1, m1, h2, m2) == 0)
                 {
                 td.dirPrice[j].hDay = h1;
             if (ParseTariffTimeStr(attr[1], h1, m1, h2, m2) == 0)
                 {
                 td.dirPrice[j].hDay = h1;


@@ -481,7 +485,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;