Ticket 37. The readTime() changed to str2x(), default value in the

[stg.git] / projects / stargazer / plugins / store / files / file_store.cpp

diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp
index cd1f0f9d723628e47d1369b0b49b4bc1b8277b7d..098f59b4c70cbdb268404526329c9177000716e6 100644 (file)
--- 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);
 
 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;
     td->tariffConf.changePolicyTimeout = 0;

+}

 else
 else

-    td->tariffConf.changePolicyTimeout = readTime(str);
+{
+    int64_t policyTime = 0;
+    if (str2x(str, policyTime) == 0)
+        td->tariffConf.changePolicyTimeout = (time_t)policyTime;
+}

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


@@ -1537,7 +1543,7 @@ std::string fileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
     cf.WriteString("TraffType", TARIFF::TraffTypeToString(td.tariffConf.traffType));
     cf.WriteString("Period", TARIFF::PeriodToString(td.tariffConf.period));
     cf.WriteString("ChangePolicy", TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));
     cf.WriteString("TraffType", TARIFF::TraffTypeToString(td.tariffConf.traffType));
     cf.WriteString("Period", TARIFF::PeriodToString(td.tariffConf.period));
     cf.WriteString("ChangePolicy", TARIFF::ChangePolicyToString(td.tariffConf.changePolicy));

-    cf.WriteString("ChangePolicyTimeout", formatTime(td.tariffConf.changePolicyTimeout));
+    cf.WriteTime("ChangePolicyTimeout", td.tariffConf.changePolicyTimeout);

     }
 
 return 0;
     }
 
 return 0;