Adjusted tests.

[stg.git] / projects / stargazer / settings_impl.cpp

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index 33b3e840c2ac7437de49bbe81b048848d2fdc768..f6a40db3d3305ce123c59f43ef112ae9e1528e54 100644 (file)
--- a/projects/stargazer/settings_impl.cpp
+++ b/projects/stargazer/settings_impl.cpp
@@ -36,11 +36,10 @@ $Author: faust $
 #include "stg/dotconfpp.h"
 #include "settings_impl.h"
 
 #include "stg/dotconfpp.h"
 #include "settings_impl.h"
 

-using namespace std;
-

 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL()
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL()

-    : strError(),
+    : SETTINGS(),
+      strError(),

       modulesPath("/usr/lib/stg"),
       dirName(DIR_NUM),
       confDir("/etc/stargazer"),
       modulesPath("/usr/lib/stg"),
       dirName(DIR_NUM),
       confDir("/etc/stargazer"),


@@ -64,6 +63,7 @@ SETTINGS_IMPL::SETTINGS_IMPL()
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),

+      reconnectOnTariffChange(false),

       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())
       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())


@@ -71,7 +71,8 @@ SETTINGS_IMPL::SETTINGS_IMPL()
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)

-    : strError(),
+    : SETTINGS(),
+      strError(),

       modulesPath("/usr/lib/stg"),
       dirName(DIR_NUM),
       confDir(cd),
       modulesPath("/usr/lib/stg"),
       dirName(DIR_NUM),
       confDir(cd),


@@ -95,6 +96,7 @@ SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),
       showFeeInCash(true),
       messageTimeout(0),
       feeChargeType(0),

+      reconnectOnTariffChange(false),

       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())
       modulesSettings(),
       storeModuleSettings(),
       logger(GetStgLogger())


@@ -102,7 +104,8 @@ SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)
 }
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)

-    : strError(),
+    : SETTINGS(),
+      strError(),

       modulesPath(rval.modulesPath),
       dirName(rval.dirName),
       confDir(rval.confDir),
       modulesPath(rval.modulesPath),
       dirName(rval.dirName),
       confDir(rval.confDir),


@@ -126,78 +129,14 @@ SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)
       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),
       feeChargeType(rval.feeChargeType),
       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),
       feeChargeType(rval.feeChargeType),

+      reconnectOnTariffChange(rval.reconnectOnTariffChange),

       modulesSettings(rval.modulesSettings),
       storeModuleSettings(rval.storeModuleSettings),
       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------
       modulesSettings(rval.modulesSettings),
       storeModuleSettings(rval.storeModuleSettings),
       logger(GetStgLogger())
 {
 }
 //-----------------------------------------------------------------------------

-int SETTINGS_IMPL::ParseYesNo(const string & value, bool * val)
-{
-if (0 == strcasecmp(value.c_str(), "yes"))
-    {
-    *val = true;
-    return 0;
-    }
-if (0 == strcasecmp(value.c_str(), "no"))
-    {
-    *val = false;
-    return 0;
-    }
-
-strError = "Incorrect value \'" + value + "\'.";
-return -1;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseInt(const string & value, int * val)
-{
-if (str2x<int>(value, *val))
-    {
-    strError = "Cannot convert \'" + value + "\' to integer.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseUnsigned(const string & value, unsigned * val)
-{
-if (str2x<unsigned>(value, *val))
-    {
-    strError = "Cannot convert \'" + value + "\' to unsigned integer.";
-    return -1;
-    }
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseIntInRange(const string & value, int min, int max, int * val)
-{
-if (ParseInt(value, val) != 0)
-    return -1;
-
-if (*val < min || *val > max)
-    {
-    strError = "Value \'" + value + "\' out of range.";
-    return -1;
-    }
-
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseUnsignedInRange(const string & value, unsigned min, unsigned max, unsigned * val)
-{
-if (ParseUnsigned(value, val) != 0)
-    return -1;
-
-if (*val < min || *val > max)
-    {
-    strError = "Value \'" + value + "\' out of range.";
-    return -1;
-    }
-
-return 0;
-}
-//-----------------------------------------------------------------------------
-int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, vector<PARAM_VALUE> * params)
+int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, std::vector<PARAM_VALUE> * params)

 {
 const DOTCONFDocumentNode * childNode;
 PARAM_VALUE pv;
 {
 const DOTCONFDocumentNode * childNode;
 PARAM_VALUE pv;


@@ -207,7 +146,7 @@ pv.param = node->getName();
 
 if (node->getValue(1))
     {
 
 if (node->getValue(1))
     {

-    strError = "Unexpected value \'" + string(node->getValue(1)) + "\'.";
+    strError = "Unexpected value \'" + std::string(node->getValue(1)) + "\'.";

     return -1;
     }
 
     return -1;
     }
 


@@ -266,7 +205,7 @@ modulesSettings.clear();
 DOTCONFDocument conf(DOTCONFDocument::CASEINSENSITIVE);
 conf.setErrorCallback(SETTINGS_IMPL::ErrorCallback, this);
 conf.setRequiredOptionNames(requiredOptions);
 DOTCONFDocument conf(DOTCONFDocument::CASEINSENSITIVE);
 conf.setErrorCallback(SETTINGS_IMPL::ErrorCallback, this);
 conf.setRequiredOptionNames(requiredOptions);

-string confFile = confDir + "/stargazer.conf";
+std::string confFile = confDir + "/stargazer.conf";

 
 if(conf.setContent(confFile.c_str()) != 0)
     {
 
 if(conf.setContent(confFile.c_str()) != 0)
     {


@@ -307,7 +246,7 @@ while (node)
         {
         if (ParseDetailStatWritePeriod(node->getValue(0)) != 0)
             {
         {
         if (ParseDetailStatWritePeriod(node->getValue(0)) != 0)
             {

-            strError = "Incorrect DetailStatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DetailStatWritePeriod value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -316,7 +255,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1440, &statWritePeriod) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1440, &statWritePeriod) != 0)
             {

-            strError = "Incorrect StatWritePeriod value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect StatWritePeriod value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -325,7 +264,7 @@ while (node)
         {
         if (ParseInt(node->getValue(0), &stgExecMsgKey) != 0)
             {
         {
         if (ParseInt(node->getValue(0), &stgExecMsgKey) != 0)
             {

-            strError = "Incorrect ExecMsgKey value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ExecMsgKey value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -334,7 +273,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1024, &executersNum) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 1, 1024, &executersNum) != 0)
             {

-            strError = "Incorrect ExecutersNum value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ExecutersNum value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -343,7 +282,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayFee) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayFee) != 0)
             {

-            strError = "Incorrect DayFee value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DayFee value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -352,7 +291,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &fullFee) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &fullFee) != 0)
             {

-            strError = "Incorrect FullFee value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect FullFee value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -361,7 +300,7 @@ while (node)
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayResetTraff) != 0)
             {
         {
         if (ParseUnsignedInRange(node->getValue(0), 0, 31, &dayResetTraff) != 0)
             {

-            strError = "Incorrect DayResetTraff value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DayResetTraff value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -370,7 +309,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &spreadFee) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &spreadFee) != 0)
             {

-            strError = "Incorrect SpreadFee value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect SpreadFee value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -379,7 +318,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &freeMbAllowInet) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &freeMbAllowInet) != 0)
             {

-            strError = "Incorrect FreeMbAllowInet value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect FreeMbAllowInet value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -388,7 +327,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &dayFeeIsLastDay) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &dayFeeIsLastDay) != 0)
             {

-            strError = "Incorrect DayFeeIsLastDay value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect DayFeeIsLastDay value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -397,7 +336,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &writeFreeMbTraffCost) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &writeFreeMbTraffCost) != 0)
             {

-            strError = "Incorrect WriteFreeMbTraffCost value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect WriteFreeMbTraffCost value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -406,7 +345,7 @@ while (node)
         {
         if (ParseYesNo(node->getValue(0), &showFeeInCash) != 0)
             {
         {
         if (ParseYesNo(node->getValue(0), &showFeeInCash) != 0)
             {

-            strError = "Incorrect ShowFeeInCash value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ShowFeeInCash value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -427,16 +366,25 @@ while (node)
         {
         if (ParseUnsigned(node->getValue(0), &messageTimeout) != 0)
             {
         {
         if (ParseUnsigned(node->getValue(0), &messageTimeout) != 0)
             {

-            strError = "Incorrect MessageTimeout value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect MessageTimeout value: \'" + std::string(node->getValue(0)) + "\'";

             return -1;
             }
         }
 
     if (strcasecmp(node->getName(), "FeeChargeType") == 0)
         {
             return -1;
             }
         }
 
     if (strcasecmp(node->getName(), "FeeChargeType") == 0)
         {

-        if (ParseUnsignedInRange(node->getValue(0), 0, 2, &feeChargeType) != 0)
+        if (ParseUnsignedInRange(node->getValue(0), 0, 3, &feeChargeType) != 0)
+            {
+            strError = "Incorrect FeeChargeType value: \'" + std::string(node->getValue(0)) + "\'";
+            return -1;
+            }
+        }
+
+    if (strcasecmp(node->getName(), "ReconnectOnTariffChange") == 0)
+        {
+        if (ParseYesNo(node->getValue(0), &reconnectOnTariffChange) != 0)

             {
             {

-            strError = "Incorrect FeeChargeType value: \'" + string(node->getValue(0)) + "\'";
+            strError = "Incorrect ReconnectOnTariffChange value: \'" + std::string(node->getValue(0)) + "\'";

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


@@ -465,7 +413,7 @@ while (node)
         {
         if (node->getValue(1))
             {
         {
         if (node->getValue(1))
             {

-            strError = "Unexpected \'" + string(node->getValue(1)) + "\'.";
+            strError = "Unexpected \'" + std::string(node->getValue(1)) + "\'.";

             return -1;
             }
 
             return -1;
             }
 


@@ -484,7 +432,7 @@ while (node)
         {
         if (node->getValue(0))
             {
         {
         if (node->getValue(0))
             {

-            strError = "Unexpected \'" + string(node->getValue(0)) + "\'.";
+            strError = "Unexpected \'" + std::string(node->getValue(0)) + "\'.";

             return -1;
             }
         const DOTCONFDocumentNode * child = node->getChildNode();
             return -1;
             }
         const DOTCONFDocumentNode * child = node->getChildNode();


@@ -507,13 +455,20 @@ while (node)
             }
         }
 
             }
         }
 

+    if (strcasecmp(node->getName(), "ScriptParams") == 0)
+        {
+        for (int i = 0; node->getValue(i) != NULL; ++i)
+            {
+            scriptParams.push_back(node->getValue(i));
+            }
+        }

     node = node->getNextNode();
     }
 
 return 0;
 }
 //-----------------------------------------------------------------------------
     node = node->getNextNode();
     }
 
 return 0;
 }
 //-----------------------------------------------------------------------------

-int SETTINGS_IMPL::ParseDetailStatWritePeriod(const string & detailStatPeriodStr)
+int SETTINGS_IMPL::ParseDetailStatWritePeriod(const std::string & detailStatPeriodStr)

 {
 if (detailStatPeriodStr == "1")
     {
 {
 if (detailStatPeriodStr == "1")
     {