More fixes after cppcheck.

[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 4bf72c0e951f051b904768f643d07833c4b29d56..3a1d7272f1267d05ace0cb08fef059e184c8e5a3 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -44,42 +44,39 @@
 
 #include <libpq-fe.h>
 
 
 #include <libpq-fe.h>
 

-#include "postgresql_store.h"
-#include "postgresql_store_utils.h"

 #include "stg/module_settings.h"
 #include "stg/module_settings.h"

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

 
 

-class POSTGRESQL_STORE_CREATOR
+namespace

 {
 {

-public:
-    POSTGRESQL_STORE_CREATOR()
-        : pqStore(new POSTGRESQL_STORE())
-        {
-        };
-    ~POSTGRESQL_STORE_CREATOR()
-        {
-        delete pqStore;
-        };
-    POSTGRESQL_STORE * GetStore() { return pqStore; };
-private:
-    POSTGRESQL_STORE * pqStore;
-} pqStoreeCreator;
+PLUGIN_CREATOR<POSTGRESQL_STORE> pgsc;
+}
+
+extern "C" STORE * GetStore();

 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {
 
 //-----------------------------------------------------------------------------
 STORE * GetStore()
 {

-return pqStoreeCreator.GetStore();
+return pgsc.GetPlugin();

 }
 
 //-----------------------------------------------------------------------------
 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"),
       server("localhost"),
       database("stargazer"),
       user("stg"),
       password("123456"),

+      clientEncoding("KOI8"),
+      settings(),
+      mutex(),

       version(0),
       version(0),

+      retries(3),

       connection(NULL),
       connection(NULL),

-      retries(3)
+      logger(GetPluginLogger(GetStgLogger(), "store_postgresql"))

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


@@ -96,7 +93,7 @@ pthread_mutex_destroy(&mutex);
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;
 int POSTGRESQL_STORE::ParseSettings()
 {
 std::vector<PARAM_VALUE>::iterator i;

-string s;
+std::string s;

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


@@ -240,6 +237,8 @@ if (CommitTransaction())
     return -1;
     }
 
     return -1;
     }
 

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

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