Ticket 37. The construction if-else removed and ReadString() changed to

ReadTime() for the ChangedPolicyTimeout in the RestoreTariff().

diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp
index 098f59b4c70cbdb268404526329c9177000716e6..6f316072c086f886bbc4f588dae4c7a8bfb91644 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -1471,16 +1471,7 @@ if (conf.ReadString("ChangePolicy", &str, "allow") < 0)
 else
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
 
 else
     td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str);
 

-if (conf.ReadString("ChangePolicyTimeout", &str, "0") < 0)
-{
-    td->tariffConf.changePolicyTimeout = 0;
-}
-else
-{
-    int64_t policyTime = 0;
-    if (str2x(str, policyTime) == 0)
-        td->tariffConf.changePolicyTimeout = (time_t)policyTime;
-}
+conf.ReadTime("ChangePolicyTimeout", &td->tariffConf.changePolicyTimeout, 0);

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------