Додано розширений формат помісячної статистики

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
index b62b292e101495b891041e92845a686ea76aa336..4658d56f52d359ff46e2e87c418030e907383675 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp
@@ -41,10 +41,6 @@ char s[UNAME_LEN + 128];
 char un[UNAME_LEN];
 struct utsname utsn;
 
 char un[UNAME_LEN];
 struct utsname utsn;
 

-int tariff_type;
-
-tariff_type = 2;
-

 uname(&utsn);
 un[0] = 0;
 
 uname(&utsn);
 un[0] = 0;
 


@@ -297,8 +293,9 @@ answerList->push_back(s);
 //  GET USERS
 //-----------------------------------------------------------------------------
 PARSER_GET_USERS::PARSER_GET_USERS()
 //  GET USERS
 //-----------------------------------------------------------------------------
 PARSER_GET_USERS::PARSER_GET_USERS()

+    : lastUserUpdateTime(0),
+      lastUpdateFound(false)

 {
 {

-lastUserUpdateTime = 0;

 }
 //-----------------------------------------------------------------------------
 int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr)
 }
 //-----------------------------------------------------------------------------
 int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr)


@@ -719,12 +716,13 @@ return -1;
 //  PARSER CHG USER
 //-----------------------------------------------------------------------------
 PARSER_CHG_USER::PARSER_CHG_USER()
 //  PARSER CHG USER
 //-----------------------------------------------------------------------------
 PARSER_CHG_USER::PARSER_CHG_USER()

+    : usr(NULL),
+      ucr(NULL),
+      upr(NULL),
+      downr(NULL),
+      cashMustBeAdded(false),
+      res(0)

 {
 {

-usr = NULL;
-ucr = NULL;
-upr = NULL;
-downr = NULL;
-

 Reset();
 }
 //-----------------------------------------------------------------------------
 Reset();
 }
 //-----------------------------------------------------------------------------


@@ -1003,11 +1001,6 @@ switch (res)
         break;
     }
 
         break;
     }
 

-}
-//-----------------------------------------------------------------------------
-int PARSER_CHG_USER::CheckUserData()
-{
-return true;

 }
 //-----------------------------------------------------------------------------
 int PARSER_CHG_USER::AplayChanges()
 }
 //-----------------------------------------------------------------------------
 int PARSER_CHG_USER::AplayChanges()