Модификация библиотеки conffiles

[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 aea3aedc1ca211a2e07592f86e3f2edfeef430be..630dfdef54ff3d88e48100091949fc6cdfd78f40 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -1298,7 +1298,7 @@ strprintf(&fileName, "%s/%s.adm", storeSettings.GetAdminsDir().c_str(), ac.login
 Touch(fileName + ".new");
 
     {
 Touch(fileName + ".new");
 
     {

-    CONFIGFILE cf(fileName);
+    CONFIGFILE cf(fileName + ".new");

 
     int e = cf.Error();
 
 
     int e = cf.Error();
 


@@ -1507,15 +1507,15 @@ return 0;
 //-----------------------------------------------------------------------------
 int FILES_STORE::RestoreTariff(TARIFF_DATA * td, const string & tariffName) const
 {
 //-----------------------------------------------------------------------------
 int FILES_STORE::RestoreTariff(TARIFF_DATA * td, const string & tariffName) const
 {

-string tariffFileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
-CONFIGFILE conf(tariffFileName);
+string fileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
+CONFIGFILE conf(fileName);

 string str;
 td->tariffConf.name = tariffName;
 
 if (conf.Error() != 0)
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
 string str;
 td->tariffConf.name = tariffName;
 
 if (conf.Error() != 0)
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-    errorStr = "Cannot read file " + tariffFileName;
+    errorStr = "Cannot read file " + fileName;

     printfd(__FILE__, "FILES_STORE::RestoreTariff - failed to read tariff '%s'\n", tariffName.c_str());
     return -1;
     }
     printfd(__FILE__, "FILES_STORE::RestoreTariff - failed to read tariff '%s'\n", tariffName.c_str());
     return -1;
     }


@@ -1666,7 +1666,7 @@ string fileName = storeSettings.GetTariffsDir() + "/" + tariffName + ".tf";
 Touch(fileName + ".new");
 
     {
 Touch(fileName + ".new");
 
     {

-    CONFIGFILE cf(fileName);
+    CONFIGFILE cf(fileName + ".new");

 
     int e = cf.Error();
 
 
     int e = cf.Error();