From: Elena Mamontova Date: Wed, 18 Jan 2017 17:45:44 +0000 (+0200) Subject: Ticket 37. The readTime() changed to str2x(), default value in the X-Git-Tag: 2.409~33 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/4c075939a17f851cb75cd75c9b35aa65105d00df?ds=sidebyside Ticket 37. The readTime() changed to str2x(), default value in the ReadString() changed to "0" for the changePolicyTimeout field in the RestoreTariff() function. --- diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp index d5cfefab..098f59b4 100644 --- a/projects/stargazer/plugins/store/files/file_store.cpp +++ b/projects/stargazer/plugins/store/files/file_store.cpp @@ -1471,10 +1471,16 @@ if (conf.ReadString("ChangePolicy", &str, "allow") < 0) else td->tariffConf.changePolicy = TARIFF::StringToChangePolicy(str); -if (conf.ReadString("ChangePolicyTimeout", &str, "1970-01-01 00:00:00") < 0) +if (conf.ReadString("ChangePolicyTimeout", &str, "0") < 0) +{ td->tariffConf.changePolicyTimeout = 0; +} else - td->tariffConf.changePolicyTimeout = readTime(str); +{ + int64_t policyTime = 0; + if (str2x(str, policyTime) == 0) + td->tariffConf.changePolicyTimeout = (time_t)policyTime; +} return 0; } //-----------------------------------------------------------------------------