Fixed message about stargazer PID.

[stg.git] / stglibs / srvconf.lib / parsers / get_tariff.cpp

diff --git a/stglibs/srvconf.lib/parsers/get_tariff.cpp b/stglibs/srvconf.lib/parsers/get_tariff.cpp
index 0ffaabb6c02c17119a69ecf38c3b885fbf762524..0804b269ac3d8980ae20b33b84c6d0375e3750d8 100644 (file)
--- a/stglibs/srvconf.lib/parsers/get_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/get_tariff.cpp
@@ -55,11 +55,12 @@ void AddAOSParser(PROPERTY_PARSERS & parsers, const std::string & name, A & arra
 
 bool GetTimeSpan(const char ** attr, DIRPRICE_DATA & value, const std::string & attrName)
 {
 
 bool GetTimeSpan(const char ** attr, DIRPRICE_DATA & value, const std::string & attrName)
 {

-int hb = 0;
-int mb = 0;
-int he = 0;
-int me = 0;

 if (CheckValue(attr, attrName))
 if (CheckValue(attr, attrName))

+    {
+    int hb = 0;
+    int mb = 0;
+    int he = 0;
+    int me = 0;

     if (ParseTariffTimeStr(attr[1], hb, mb, he, me) == 0)
         {
         value.hDay = hb;
     if (ParseTariffTimeStr(attr[1], hb, mb, he, me) == 0)
         {
         value.hDay = hb;


@@ -68,6 +69,7 @@ if (CheckValue(attr, attrName))
         value.mNight = me;
         return true;
         }
         value.mNight = me;
         return true;
         }

+    }

 return false;
 }
 
 return false;
 }
 


@@ -76,17 +78,7 @@ bool GetTraffType(const char ** attr, T & value, const std::string & attrName)
 {
 if (!CheckValue(attr, attrName))
     return false;
 {
 if (!CheckValue(attr, attrName))
     return false;

-std::string type(attr[1]);
-if (type == "up")
-    value = TRAFF_UP;
-else if (type == "down")
-    value = TRAFF_DOWN;
-else if (type == "up+down")
-    value = TRAFF_UP_DOWN;
-else if (type == "max")
-    value = TRAFF_MAX;
-else
-    return false;
+value = TARIFF::StringToTraffType(attr[1]);

 return true;
 }
 
 return true;
 }