Moved CHG_USER and SEND_MESSAGE parsers from global scope.

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

diff --git a/projects/stargazer/settings_impl.cpp b/projects/stargazer/settings_impl.cpp
index b547c4a78225cec6d8de56e9e17d448c6f069a9e..92670cb5082a345768582a2173ce06803fa0d43f 100644 (file)
--- a/projects/stargazer/settings_impl.cpp
+++ b/projects/stargazer/settings_impl.cpp
@@ -32,16 +32,18 @@ $Author: faust $
 #include <cerrno>
 #include <string>
 
 #include <cerrno>
 #include <string>
 

+#include "stg/logger.h"
+#include "stg/dotconfpp.h"

 #include "settings_impl.h"
 #include "settings_impl.h"

-#include "stg_logger.h"
-#include "dotconfpp.h"

 
 using namespace std;
 
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL()
 
 using namespace std;
 
 //-----------------------------------------------------------------------------
 SETTINGS_IMPL::SETTINGS_IMPL()

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

       modulesPath("/usr/lib/stg"),
       modulesPath("/usr/lib/stg"),

+      dirName(DIR_NUM),

       confDir("/etc/stargazer"),
       scriptsDir("/etc/stargazer"),
       rules("/etc/stargazer/rules"),
       confDir("/etc/stargazer"),
       scriptsDir("/etc/stargazer"),
       rules("/etc/stargazer/rules"),


@@ -62,6 +64,8 @@ SETTINGS_IMPL::SETTINGS_IMPL()
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),

+      feeChargeType(0),
+      reconnectOnTariffChange(false),

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


@@ -69,7 +73,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),


@@ -92,6 +97,8 @@ SETTINGS_IMPL::SETTINGS_IMPL(const std::string & cd)
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),
       writeFreeMbTraffCost(false),
       showFeeInCash(true),
       messageTimeout(0),

+      feeChargeType(0),
+      reconnectOnTariffChange(false),

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


@@ -99,7 +106,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),


@@ -122,77 +130,14 @@ SETTINGS_IMPL::SETTINGS_IMPL(const SETTINGS_IMPL & rval)
       writeFreeMbTraffCost(rval.writeFreeMbTraffCost),
       showFeeInCash(rval.showFeeInCash),
       messageTimeout(rval.messageTimeout),
       writeFreeMbTraffCost(rval.writeFreeMbTraffCost),
       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)
 {
 const DOTCONFDocumentNode * childNode;
 int SETTINGS_IMPL::ParseModuleSettings(const DOTCONFDocumentNode * node, vector<PARAM_VALUE> * params)
 {
 const DOTCONFDocumentNode * childNode;


@@ -234,9 +179,9 @@ return 0;
 //-----------------------------------------------------------------------------
 void SETTINGS_IMPL::ErrorCallback(void * data, const char * buf)
 {
 //-----------------------------------------------------------------------------
 void SETTINGS_IMPL::ErrorCallback(void * data, const char * buf)
 {

-    printfd(__FILE__, buf);
+    printfd(__FILE__, "SETTINGS_IMPL::ErrorCallback() - %s\n", buf);

     SETTINGS_IMPL * settings = static_cast<SETTINGS_IMPL *>(data);
     SETTINGS_IMPL * settings = static_cast<SETTINGS_IMPL *>(data);

-    settings->logger(buf);
+    settings->logger("%s", buf);

 }
 //-----------------------------------------------------------------------------
 int SETTINGS_IMPL::ReadSettings()
 }
 //-----------------------------------------------------------------------------
 int SETTINGS_IMPL::ReadSettings()


@@ -428,6 +373,24 @@ while (node)
             }
         }
 
             }
         }
 

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

     if (strcasecmp(node->getName(), "DirNames") == 0)
         {
         const DOTCONFDocumentNode * child = node->getChildNode();
     if (strcasecmp(node->getName(), "DirNames") == 0)
         {
         const DOTCONFDocumentNode * child = node->getChildNode();


@@ -494,6 +457,13 @@ 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();
     }
 
     node = node->getNextNode();
     }
 


@@ -525,4 +495,4 @@ else if (detailStatPeriodStr == "1/6")
 
 return -1;
 }
 
 return -1;
 }

-//-----------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
\ No newline at end of file