X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/838ec5745c5198692997e0a1cb8a147682cba210..a91e9542b384905187890f161d4da5396996fcfd:/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 4bf72c0e..ba478966 100644
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -38,36 +38,19 @@
  *
  */
 
+#include "postgresql_store.h"
+
+#include "stg/common.h" // str2x, printfd
+
 #include <string>
 #include <vector>
-#include <algorithm>
 
 #include <libpq-fe.h>
 
-#include "postgresql_store.h"
-#include "postgresql_store_utils.h"
-#include "stg/module_settings.h"
-
-class POSTGRESQL_STORE_CREATOR
+extern "C" STG::Store* GetStore()
 {
-public:
-    POSTGRESQL_STORE_CREATOR()
-        : pqStore(new POSTGRESQL_STORE())
-        {
-        };
-    ~POSTGRESQL_STORE_CREATOR()
-        {
-        delete pqStore;
-        };
-    POSTGRESQL_STORE * GetStore() { return pqStore; };
-private:
-    POSTGRESQL_STORE * pqStore;
-} pqStoreeCreator;
-
-//-----------------------------------------------------------------------------
-STORE * GetStore()
-{
-return pqStoreeCreator.GetStore();
+    static POSTGRESQL_STORE plugin;
+    return &plugin;
 }
 
 //-----------------------------------------------------------------------------
@@ -77,9 +60,11 @@ POSTGRESQL_STORE::POSTGRESQL_STORE()
       database("stargazer"),
       user("stg"),
       password("123456"),
+      clientEncoding("KOI8"),
       version(0),
+      retries(3),
       connection(NULL),
-      retries(3)
+      logger(STG::PluginLogger::get("store_postgresql"))
 {
 pthread_mutex_init(&mutex, NULL);
 }
@@ -95,32 +80,32 @@ pthread_mutex_destroy(&mutex);
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::ParseSettings()
 {
-std::vector<PARAM_VALUE>::iterator i;
-string s;
+std::vector<STG::ParamValue>::iterator i;
 
 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());
@@ -240,6 +225,8 @@ if (CommitTransaction())
     return -1;
     }
 
+logger("POSTGRESQL_STORE: Current DB schema version: %d", version);
+
 return 0;
 }
 //-----------------------------------------------------------------------------