More stgTime cleanup.

[stg.git] / 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 5e2d8ae6de9e29aa608686d0cc3351f406355c97..2146d66483f32dc9179122828cbe0b146584694d 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -40,42 +40,34 @@
 
 #include "postgresql_store.h"
 
 
 #include "postgresql_store.h"
 

-#include "stg/module_settings.h"
-#include "stg/plugin_creator.h"
+#include "postgresql_store_utils.h"
+#include "postgresql_store.h"

 
 

-#include <libpq-fe.h>
+#include "stg/common.h" // str2x, printfd

 
 #include <string>
 #include <vector>
 
 
 #include <string>
 #include <vector>
 

-namespace
-{
-PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
-}
-
-extern "C" STORE * GetStore();
+#include <libpq-fe.h>

 
 

-//-----------------------------------------------------------------------------
-STORE * GetStore()
+extern "C" STG::Store* GetStore()

 {
 {

-return pgsc.GetPlugin();
+    static POSTGRESQL_STORE plugin;
+    return &plugin;

 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()
     : versionString("postgresql_store v.1.3"),
 }
 
 //-----------------------------------------------------------------------------
 POSTGRESQL_STORE::POSTGRESQL_STORE()
     : versionString("postgresql_store v.1.3"),

-      strError(),

       server("localhost"),
       database("stargazer"),
       user("stg"),
       password("123456"),
       clientEncoding("KOI8"),
       server("localhost"),
       database("stargazer"),
       user("stg"),
       password("123456"),
       clientEncoding("KOI8"),

-      settings(),
-      mutex(),

       version(0),
       retries(3),
       connection(NULL),
       version(0),
       retries(3),
       connection(NULL),

-      logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))
+      logger(STG::PluginLogger::get("store_postgresql"))

 {
 pthread_mutex_init(&mutex, NULL);
 }
 {
 pthread_mutex_init(&mutex, NULL);
 }


@@ -91,26 +83,38 @@ pthread_mutex_destroy(&mutex);
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::ParseSettings()
 {
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::ParseSettings()
 {

-std::vector<PARAM_VALUE>::iterator i;
+std::vector<STG::ParamValue>::iterator i;

 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {
 
 for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i)
     {

-    std::string param(ToLower(i->param));
-    if (param == "server")
-        server = *(i->value.begin());
-    else if (param == "database")
-        database = *(i->value.begin());
-    else if (param == "user")
-        user = *(i->value.begin());
-    else if (param == "password")
-        password = *(i->value.begin());
-    else if (param == "retries")
-        if (str2x(*(i->value.begin()), retries))
+    if (i->value.empty())
+        continue;
+    std::string s = ToLower(i->param);
+    if (s == "server")
+        {
+        server = i->value.front();
+        }
+    if (s == "database")
+        {
+        database = i->value.front();
+        }
+    if (s == "user")
+        {
+        user = i->value.front();
+        }
+    if (s == "password")
+        {
+        password = i->value.front();
+        }
+    if (s == "retries")
+        {
+        if (str2x(i->value.front(), retries))

             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
             return -1;
             }
             {
             strError = "Invalid 'retries' value";
             printfd(__FILE__, "POSTGRESQL_STORE::ParseSettings(): '%s'\n", strError.c_str());
             return -1;
             }

+        }

     }
 
 clientEncoding = "KOI8";
     }
 
 clientEncoding = "KOI8";


@@ -224,6 +228,8 @@ if (CommitTransaction())
     return -1;
     }
 
     return -1;
     }
 

+logger("POSTGRESQL_STORE: Current DB schema version: %d", version);
+

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