X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/f907011b4827e85763372cdea76944b3b1cc3fd2..66c4165457f76e06ce6716a42dd4c8495af916db:/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index 51eec8f4..a9836911 100644
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,41 +38,44 @@
  *
  */
 
+#include "postgresql_store.h"
+
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"
+
+#include "stg/module_settings.h"
+#include "stg/plugin_creator.h"
+
 #include <string>
 #include <vector>
-#include <algorithm>
 
 #include <libpq-fe.h>
 
-#include "stg/module_settings.h"
-#include "stg/plugin_creator.h"
-#include "stg/logger.h"
-#include "postgresql_store_utils.h"
-#include "postgresql_store.h"
+namespace
+{
+PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
+}
 
-PLUGIN_CREATOR<POSTGRESQL_STORE> pqStoreeCreator;
+extern "C" STORE * GetStore();
 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {
-return pqStoreeCreator.GetPlugin();
+return pgsc.GetPlugin();
 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()
     : versionString("postgresql_store v.1.3"),
-      strError(),
       server("localhost"),
       database("stargazer"),
       user("stg"),
       password("123456"),
       clientEncoding("KOI8"),
-      settings(),
-      mutex(),
       version(0),
       retries(3),
       connection(NULL),
-      WriteServLog(GetStgLogger())
+      logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))
 {
 pthread_mutex_init(&mutex, NULL);
 }
@@ -89,31 +92,31 @@ pthread_mutex_destroy(&mutex);
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;
-string s;
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
-    s = i->param;
-    std::transform(s.begin(), s.end(), s.begin(), ToLower());
+    if (i->value.empty())
+        continue;
+    std::string s = ToLower(i->param);
     if (s == "server")
         {
-        server = *(i->value.begin());
+        server = i->value.front();
         }
     if (s == "database")
         {
-        database = *(i->value.begin());
+        database = i->value.front();
         }
     if (s == "user")
         {
-        user = *(i->value.begin());
+        user = i->value.front();
         }
     if (s == "password")
         {
-        password = *(i->value.begin());
+        password = i->value.front();
         }
     if (s == "retries")
         {
-        if (str2x(*(i->value.begin()), retries))
+        if (str2x(i->value.front(), retries))
             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
@@ -233,7 +236,7 @@ if (CommitTransaction())
     return -1;
     }
 
-WriteServLog("POSTGRESQL_STORE: Current DB schema version: %d", version);
+logger("POSTGRESQL_STORE: Current DB schema version: %d", version);
 
 return 0;
 }