Виправлено помилки компіляції на платформі WIN32

[stg.git] / projects / stargazer / user.cpp

diff --git a/projects/stargazer/user.cpp b/projects/stargazer/user.cpp
index b68c632ab91fd3b93491bb6c5e404cd71919a104..3d9371fda7f7c5110f200c92175f31668ef00416 100644 (file)
--- a/projects/stargazer/user.cpp
+++ b/projects/stargazer/user.cpp
@@ -1158,9 +1158,8 @@ if (SendMessage(*msg))
     if (store->AddMessage(msg, login))
         {
         errorStr = store->GetStrError();
     if (store->AddMessage(msg, login))
         {
         errorStr = store->GetStrError();

-        STG_LOGGER & WriteServLog = GetStgLogger();
-        WriteServLog("Error adding message %s", errorStr.c_str());
-        WriteServLog("%s", store->GetStrError().c_str());
+        WriteServLog("Error adding message: '%s'", errorStr.c_str());
+        printfd(__FILE__, "Error adding message: '%s'\n", errorStr.c_str());

         return -1;
         }
     messages.push_back(*msg);
         return -1;
         }
     messages.push_back(*msg);


@@ -1179,9 +1178,8 @@ else
         if (store->AddMessage(msg, login))
             {
             errorStr = store->GetStrError();
         if (store->AddMessage(msg, login))
             {
             errorStr = store->GetStrError();

-            STG_LOGGER & WriteServLog = GetStgLogger();
-            WriteServLog("Error adding message %s", errorStr.c_str());
-            WriteServLog("%s", store->GetStrError().c_str());
+            WriteServLog("Error adding repeatable message: '%s'", errorStr.c_str());
+            printfd(__FILE__, "Error adding repeatable message: '%s'\n", errorStr.c_str());

             return -1;
             }
         messages.push_back(*msg);
             return -1;
             }
         messages.push_back(*msg);


@@ -1258,29 +1256,40 @@ for (unsigned i = 0; i < hdrsList.size(); i++)
 std::list<STG_MSG>::iterator it(messages.begin());
 while (it != messages.end())
     {
 std::list<STG_MSG>::iterator it(messages.begin());
 while (it != messages.end())
     {

-    if (SendMessage(*it))
-        {
-        return -1;
-        }
-    it->header.repeat--;
-    if (it->header.repeat < 0)
+    if (static_cast<time_t>(it->header.lastSendTime + it->header.repeatPeriod * 60) < stgTime)

         {
         {

-        printfd(__FILE__, "DelMessage\n");
-        store->DelMessage(it->header.id, login);
-        messages.erase(it++);
+        if (SendMessage(*it))
+            {
+            return -1;
+            }
+        it->header.repeat--;
+        if (it->header.repeat < 0)
+            {
+            if (store->DelMessage(it->header.id, login))
+                {
+                WriteServLog("Error deleting message: '%s'", store->GetStrError().c_str());
+                printfd(__FILE__, "Error deleting message: '%s'\n", store->GetStrError().c_str());
+                }
+            messages.erase(it++);
+            }
+        else
+            {
+            #ifndef DEBUG
+            //TODO: gcc v. 4.x generate ICE on x86_64
+            it->header.lastSendTime = time(NULL);
+            #else
+            it->header.lastSendTime = stgTime;
+            #endif
+            if (store->EditMessage(*it, login))
+                {
+                WriteServLog("Error modifying message: '%s'", store->GetStrError().c_str());
+                printfd(__FILE__, "Error modifying message: '%s'\n", store->GetStrError().c_str());
+                }
+            ++it;
+            }

         }
     else
         {
         }
     else
         {

-        #ifndef DEBUG
-        //TODO: gcc v. 4.x generate ICE on x86_64
-        it->header.lastSendTime = time(NULL);
-        #else
-        it->header.lastSendTime = stgTime;
-        #endif
-        if (store->EditMessage(*it, login))
-            {
-            printfd(__FILE__, "EditMessage Error %s\n", store->GetStrError().c_str());
-            }

         ++it;
         }
     }
         ++it;
         }
     }