X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9fdd58e794e43fc2435265c4fb2f6933758f3c0b..73bee151e048054bde9a39c5ad2efec25af9c77b:/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 3a1d7272..ba478966 100644 --- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp +++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp @@ -38,45 +38,33 @@ * */ +#include "postgresql_store.h" + +#include "stg/common.h" // str2x, printfd + #include #include -#include #include -#include "stg/module_settings.h" -#include "stg/plugin_creator.h" -#include "postgresql_store_utils.h" -#include "postgresql_store.h" - -namespace -{ -PLUGIN_CREATOR pgsc; -} - -extern "C" STORE * GetStore(); - -//----------------------------------------------------------------------------- -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"), - strError(), server("localhost"), database("stargazer"), user("stg"), password("123456"), clientEncoding("KOI8"), - settings(), - mutex(), version(0), retries(3), connection(NULL), - logger(GetPluginLogger(GetStgLogger(), "store_postgresql")) + logger(STG::PluginLogger::get("store_postgresql")) { pthread_mutex_init(&mutex, NULL); } @@ -92,32 +80,32 @@ pthread_mutex_destroy(&mutex); //----------------------------------------------------------------------------- int POSTGRESQL_STORE::ParseSettings() { -std::vector::iterator i; -std::string s; +std::vector::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());