X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..68ff250b88c43acf959cdf80eb9c3a519157a3f7:/projects/stargazer/plugins/store/firebird/firebird_store.cpp diff --git a/projects/stargazer/plugins/store/firebird/firebird_store.cpp b/projects/stargazer/plugins/store/firebird/firebird_store.cpp index c9265e14..9cc7c304 100644 --- a/projects/stargazer/plugins/store/firebird/firebird_store.cpp +++ b/projects/stargazer/plugins/store/firebird/firebird_store.cpp @@ -30,48 +30,39 @@ #include #include -using namespace std; - +#include "stg/ibpp.h" +#include "stg/plugin_creator.h" #include "firebird_store.h" -#include "ibpp.h" -class FIREBIRD_STORE_CREATOR +namespace { -public: - FIREBIRD_STORE_CREATOR() - : frb(new FIREBIRD_STORE()) - { - }; - ~FIREBIRD_STORE_CREATOR() - { - delete frb; - }; - FIREBIRD_STORE * GetStore() { return frb; }; -private: - FIREBIRD_STORE * frb; -} frsc; +PLUGIN_CREATOR frsc; +} +extern "C" STORE * GetStore(); //----------------------------------------------------------------------------- -BASE_STORE * GetStore() +STORE * GetStore() { -return frsc.GetStore(); +return frsc.GetPlugin(); } //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- FIREBIRD_STORE::FIREBIRD_STORE() + : version("firebird_store v.1.4"), + strError(), + db_server("localhost"), + db_database("/var/stg/stargazer.fdb"), + db_user("stg"), + db_password("123456"), + settings(), + db(), + mutex(), + til(IBPP::ilConcurrency), + tlr(IBPP::lrWait), + logger(GetPluginLogger(GetStgLogger(), "store_firebird")) { -db_server = "localhost"; -db_database = "/var/stg/stargazer.fdb"; -db_user = "stg"; -db_password = "123456"; -version = "firebird_store v.1.4"; pthread_mutex_init(&mutex, NULL); - -// Advanced settings defaults - -til = IBPP::ilConcurrency; -tlr = IBPP::lrWait; } //----------------------------------------------------------------------------- FIREBIRD_STORE::~FIREBIRD_STORE() @@ -81,13 +72,13 @@ db->Disconnect(); //----------------------------------------------------------------------------- int FIREBIRD_STORE::ParseSettings() { -vector::iterator i; -string s; +std::vector::iterator i; +std::string s; for(i = settings.moduleParams.begin(); i != settings.moduleParams.end(); ++i) { s = i->param; - transform(s.begin(), s.end(), s.begin(), ToLower()); + std::transform(s.begin(), s.end(), s.begin(), ToLower()); if (s == "server") { db_server = *(i->value.begin());