Cosmetic changes in settings.[h|cpp]

diff --git a/projects/stargazer/settings.cpp b/projects/stargazer/settings.cpp
index c863fbbd9012465cd36af563d9c9e487893c675a..8af7f7aa80ba9e58125b4c7e9417cc5a2bd629bc 100644 (file)
--- a/projects/stargazer/settings.cpp
+++ b/projects/stargazer/settings.cpp
@@ -244,8 +244,6 @@ conf.setErrorCallback(SETTINGS::ErrorCallback, this);
 conf.setRequiredOptionNames(requiredOptions);
 string confFile = confDir + "/stargazer.conf";
 
 conf.setRequiredOptionNames(requiredOptions);
 string confFile = confDir + "/stargazer.conf";
 

-//printfd(__FILE__, "Conffile: %s\n", confFile.c_str());
-

 if(conf.setContent(confFile.c_str()) != 0)
     {
     strError = "Cannot read file " + confFile;
 if(conf.setContent(confFile.c_str()) != 0)
     {
     strError = "Cannot read file " + confFile;


@@ -259,31 +257,26 @@ while (node)
     if (strcasecmp(node->getName(), "ScriptDir") == 0)
         {
         scriptsDir = node->getValue(0);
     if (strcasecmp(node->getName(), "ScriptDir") == 0)
         {
         scriptsDir = node->getValue(0);

-        //printfd(__FILE__, "LogFile: %s\n", logFile.c_str());

         }
 
     if (strcasecmp(node->getName(), "LogFile") == 0)
         {
         logFile = node->getValue(0);
         }
 
     if (strcasecmp(node->getName(), "LogFile") == 0)
         {
         logFile = node->getValue(0);

-        //printfd(__FILE__, "LogFile: %s\n", logFile.c_str());

         }
 
     if (strcasecmp(node->getName(), "PIDFile") == 0)
         {
         pidFile = node->getValue(0);
         }
 
     if (strcasecmp(node->getName(), "PIDFile") == 0)
         {
         pidFile = node->getValue(0);

-        //printfd(__FILE__, "PIDFile: %s\n", pidFile.c_str());

         }
 
     if (strcasecmp(node->getName(), "ModulesPath") == 0)
         {
         modulesPath = node->getValue(0);
         }
 
     if (strcasecmp(node->getName(), "ModulesPath") == 0)
         {
         modulesPath = node->getValue(0);

-        //printfd(__FILE__, "ModulesPath: %s\n", logFile.c_str());

         }
 
     if (strcasecmp(node->getName(), "Rules") == 0)
         {
         rules = node->getValue(0);
         }
 
     if (strcasecmp(node->getName(), "Rules") == 0)
         {
         rules = node->getValue(0);

-        //printfd(__FILE__, "Rules: %s\n", rules.c_str());

         }
 
     if (strcasecmp(node->getName(), "DetailStatWritePeriod") == 0)
         }
 
     if (strcasecmp(node->getName(), "DetailStatWritePeriod") == 0)


@@ -293,7 +286,6 @@ while (node)
             strError = "Incorrect DetailStatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect DetailStatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "DetailStatWritePeriod: %d\n", detailStatWritePeriod);

         }
 
     if (strcasecmp(node->getName(), "StatWritePeriod") == 0)
         }
 
     if (strcasecmp(node->getName(), "StatWritePeriod") == 0)


@@ -303,7 +295,6 @@ while (node)
             strError = "Incorrect StatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect StatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "StatWritePeriod: %d\n", statWritePeriod);

         }
 
     if (strcasecmp(node->getName(), "ExecMsgKey") == 0)
         }
 
     if (strcasecmp(node->getName(), "ExecMsgKey") == 0)


@@ -322,7 +313,6 @@ while (node)
             strError = "Incorrect ExecutersNum value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect ExecutersNum value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "DayResetTraff: %d\n", dayResetTraff);

         }
 
     if (strcasecmp(node->getName(), "DayFee") == 0)
         }
 
     if (strcasecmp(node->getName(), "DayFee") == 0)


@@ -332,7 +322,6 @@ while (node)
             strError = "Incorrect DayFee value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect DayFee value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "DayFee: %d\n", dayFee);

         }
 
     if (strcasecmp(node->getName(), "FullFee") == 0)
         }
 
     if (strcasecmp(node->getName(), "FullFee") == 0)


@@ -342,7 +331,6 @@ while (node)
             strError = "Incorrect FullFee value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect FullFee value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "DayFee: %d\n", dayFee);

         }
 
     if (strcasecmp(node->getName(), "DayResetTraff") == 0)
         }
 
     if (strcasecmp(node->getName(), "DayResetTraff") == 0)


@@ -352,7 +340,6 @@ while (node)
             strError = "Incorrect DayResetTraff value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect DayResetTraff value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "DayResetTraff: %d\n", dayResetTraff);

         }
 
     if (strcasecmp(node->getName(), "SpreadFee") == 0)
         }
 
     if (strcasecmp(node->getName(), "SpreadFee") == 0)


@@ -362,7 +349,6 @@ while (node)
             strError = "Incorrect SpreadFee value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect SpreadFee value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "SpreadFee: %d\n", spreadFee);

         }
 
     if (strcasecmp(node->getName(), "FreeMbAllowInet") == 0)
         }
 
     if (strcasecmp(node->getName(), "FreeMbAllowInet") == 0)


@@ -372,7 +358,6 @@ while (node)
             strError = "Incorrect FreeMbAllowInet value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect FreeMbAllowInet value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "FreeMbAllowInet: %d\n", freeMbAllowInet);

         }
 
     if (strcasecmp(node->getName(), "DayFeeIsLastDay") == 0)
         }
 
     if (strcasecmp(node->getName(), "DayFeeIsLastDay") == 0)


@@ -382,7 +367,6 @@ while (node)
             strError = "Incorrect DayFeeIsLastDay value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect DayFeeIsLastDay value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "DayFeeIsLastDay: %d\n", dayFeeIsLastDay);

         }
 
     if (strcasecmp(node->getName(), "WriteFreeMbTraffCost") == 0)
         }
 
     if (strcasecmp(node->getName(), "WriteFreeMbTraffCost") == 0)


@@ -392,7 +376,6 @@ while (node)
             strError = "Incorrect WriteFreeMbTraffCost value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect WriteFreeMbTraffCost value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "WriteFreeMbTraffCost: %d\n", writeFreeMbTraffCost);

         }
 
     if (strcasecmp(node->getName(), "ShowFeeInCash") == 0)
         }
 
     if (strcasecmp(node->getName(), "ShowFeeInCash") == 0)


@@ -402,7 +385,6 @@ while (node)
             strError = "Incorrect ShowFeeInCash value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect ShowFeeInCash value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "ShowFeeInCash: %d\n", showFeeInCash);

         }
 
     if (strcasecmp(node->getName(), "MonitorDir") == 0)
         }
 
     if (strcasecmp(node->getName(), "MonitorDir") == 0)


@@ -424,12 +406,10 @@ while (node)
             strError = "Incorrect MessageTimeout value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }
             strError = "Incorrect MessageTimeout value: \'" + string(node->getValue(0)) + "\'";
             return -1;
             }

-        //printfd(__FILE__, "MessageTimeout: %d\n", messageTimeout);

         }
 
     if (strcasecmp(node->getName(), "DirNames") == 0)
         {
         }
 
     if (strcasecmp(node->getName(), "DirNames") == 0)
         {

-        // íÙ ×ÎÕÔÒÉ ÓÅËÃÉÉ DirNames

         const DOTCONFDocumentNode * child = node->getChildNode();
         if (child)
             {
         const DOTCONFDocumentNode * child = node->getChildNode();
         if (child)
             {


@@ -449,19 +429,14 @@ while (node)
 
     if (strcasecmp(node->getName(), "StoreModule") == 0)
         {
 
     if (strcasecmp(node->getName(), "StoreModule") == 0)
         {

-        // íÙ ×ÎÕÔÒÉ ÓÅËÃÉÉ StoreModule
-        //printfd(__FILE__, "StoreModule\n");
-

         if (node->getValue(1))
             {
         if (node->getValue(1))
             {

-            // StoreModule ÄÏÌÖÅÎ ÉÍÅÔØ 1 ÁÔÒÉÂÕÔ

             strError = "Unexpected \'" + string(node->getValue(1)) + "\'.";
             return -1;
             }
 
         if (storeModulesCount)
             {
             strError = "Unexpected \'" + string(node->getValue(1)) + "\'.";
             return -1;
             }
 
         if (storeModulesCount)
             {

-            // äÏÌÖÅÎ ÂÙÔØ ÔÏÌØËÏ ÏÄÉÎ ÍÏÄÕÌØ StoreModule!

             strError = "Should be only one StoreModule.";
             return -1;
             }
             strError = "Should be only one StoreModule.";
             return -1;
             }


@@ -471,20 +446,16 @@ while (node)
         ParseModuleSettings(node, &storeModuleSettings.moduleParams);
         }
 
         ParseModuleSettings(node, &storeModuleSettings.moduleParams);
         }
 

-    // þÉÔÁÅÍ ÎÁÓÔÒÏÊËÉ ×ÓÅÈ ÏÓÔÁ×ÛÉÈÓÑ ÍÏÄÕÌÅÊ.

     if (strcasecmp(node->getName(), "Modules") == 0)
         {
     if (strcasecmp(node->getName(), "Modules") == 0)
         {

-        // íÙ ×ÎÕÔÒÉ ÓÅËÃÉÉ Modules

         if (node->getValue(0))
             {
         if (node->getValue(0))
             {

-            // Modules ÎÅ ÄÏÌÖÅÎ ÉÍÅÔØ ÁÔÒÉÂÕÏ×

             strError = "Unexpected \'" + string(node->getValue(0)) + "\'.";
             return -1;
             }
         const DOTCONFDocumentNode * child = node->getChildNode();
         while (child)
             {
             strError = "Unexpected \'" + string(node->getValue(0)) + "\'.";
             return -1;
             }
         const DOTCONFDocumentNode * child = node->getChildNode();
         while (child)
             {

-            // íÙ ×ÎÕÔÒÉ ÓÅËÃÉÉ

             if (strcasecmp(child->getName(), "Module") != 0)
                 {
                 child = child->getNextNode();
             if (strcasecmp(child->getName(), "Module") != 0)
                 {
                 child = child->getNextNode();

diff --git a/projects/stargazer/settings.h b/projects/stargazer/settings.h
index 16a9d61b4b059a714a7c47df3bc87da8a550840a..86262808afe191ba9fd3b6e1c3db3f77b0126568 100644 (file)
--- a/projects/stargazer/settings.h
+++ b/projects/stargazer/settings.h
@@ -91,7 +91,7 @@ public:
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
 
     const std::string & GetModulesPath() const { return modulesPath; }
     unsigned            GetMessageTimeout() const { return messageTimeout * 3600 * 24; }
 
     const std::string & GetModulesPath() const { return modulesPath; }

-    const MODULE_SETTINGS         & GetStoreModuleSettings() const
+    const MODULE_SETTINGS & GetStoreModuleSettings() const

         { return storeModuleSettings; }
     const std::vector<MODULE_SETTINGS> & GetModulesSettings() const
         { return modulesSettings; }
         { return storeModuleSettings; }
     const std::vector<MODULE_SETTINGS> & GetModulesSettings() const
         { return modulesSettings; }


@@ -110,6 +110,7 @@ private:
     static void ErrorCallback(void * data, const char * buf);
 
     std::string strError;
     static void ErrorCallback(void * data, const char * buf);
 
     std::string strError;

+

     //////////settings
     std::string modulesPath;
     std::string dirName[DIR_NUM];
     //////////settings
     std::string modulesPath;
     std::string dirName[DIR_NUM];


@@ -125,14 +126,14 @@ private:
     int         stgExecMsgKey;
     unsigned    executersNum;
     bool        fullFee;
     int         stgExecMsgKey;
     unsigned    executersNum;
     bool        fullFee;

-    unsigned    dayFee;        // ÄÅÎØ ÓÎÑÔÉÑ ÁÂÏÎÐÌÁÔÙ
-    unsigned    dayResetTraff; // îÁÞÁÌÏ ÕÞÅÔÎÏÇÏ ÐÅÒÉÏÄÁ: ÄÅÎØ ÏÂÎÕÌÅÎÉÑ ÔÒÁÆÉËÁ É ÓÍÅÎÙ ÔÁÒÉÆÁ
+    unsigned    dayFee;
+    unsigned    dayResetTraff;

     bool        spreadFee;
     bool        freeMbAllowInet;
     bool        spreadFee;
     bool        freeMbAllowInet;

-    bool        dayFeeIsLastDay; // áð ÓÎÉÍÁÅÔÓÑ × ËÏÎÃÅ ÍÅÓÑÃÁ (true) ÉÌÉ × ÎÁÞÁÌÅ (false)
-    bool        writeFreeMbTraffCost; // ðÉÓÁÔØ × ÄÅÔÁÌØÎÕÀ ÓÔÁÔÉÓÔÉËÕ ÓÔÏÉÍÏÓÔØ ÔÒÁÆÉËÁ, ÅÓÌÉ ÅÝÅ ÅÓÔØ ÐÒÅÄÏÐÌÁÞÅÎÎÙÊ ÔÒÁÆÉË
-    bool        showFeeInCash; // ðÏËÁÚÙ×ÁÔØ ÐÏÌØÚÏ×ÁÔÅÌÀ áð ÎÅ ÓÞÅÔÕ É ÐÏÚ×ÏÌÑÔØ ÅÅ ÉÓÐÏÌØÚÏ×ÁÔØ
-    unsigned    messageTimeout; // ÷ÒÅÍÑ ÖÉÚÎÉ ÎÅÏÔÐÒÁ×ÌÅÎÎÏÇÏ ÓÏÏÂÝÅÎÉÑ × ÓÅËÕÎÄÁÈ
+    bool        dayFeeIsLastDay;
+    bool        writeFreeMbTraffCost;
+    bool        showFeeInCash;
+    unsigned    messageTimeout;

 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;


@@ -140,4 +141,5 @@ private:
     STG_LOGGER & logger;
 };
 //-----------------------------------------------------------------------------
     STG_LOGGER & logger;
 };
 //-----------------------------------------------------------------------------

+

 #endif
 #endif