GetScriptDir -> GetScriptsDir

[stg.git] / projects / stargazer / main.cpp

diff --git a/projects/stargazer/main.cpp b/projects/stargazer/main.cpp
index 12fa738391a1bc7b2f1a514f210c418e521ccc5e..6a8c61f51dea08829f1a4fd38a45ccdd585e575b 100644 (file)
--- a/projects/stargazer/main.cpp
+++ b/projects/stargazer/main.cpp
@@ -51,7 +51,7 @@
 #include "tariffs_impl.h"
 #include "common.h"
 #include "traffcounter.h"
 #include "tariffs_impl.h"
 #include "common.h"
 #include "traffcounter.h"

-#include "base_plugin.h"
+#include "plugin.h"

 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin_runner.h"
 #include "stg_logger.h"
 #include "stg_timer.h"
 #include "plugin_runner.h"


@@ -451,7 +451,7 @@ int main(int argc, char * argv[])
  * */
 
 SETTINGS * settings = NULL;
  * */
 
 SETTINGS * settings = NULL;

-BASE_STORE * dataStore = NULL;
+STORE * dataStore = NULL;

 TARIFFS * tariffs = NULL;
 ADMINS * admins = NULL;
 USERS * users = NULL;
 TARIFFS * tariffs = NULL;
 ADMINS * admins = NULL;
 USERS * users = NULL;


@@ -552,7 +552,7 @@ WriteServLog("Storage plugin: %s. Loading successfull.", dataStore->GetVersion()
 
 tariffs = new TARIFFS_IMPL(dataStore);
 admins = new ADMINS_IMPL(dataStore);
 
 tariffs = new TARIFFS_IMPL(dataStore);
 admins = new ADMINS_IMPL(dataStore);

-users = new USERS_IMPL(settings, dataStore, tariffs, *admins->GetSysAdmin());
+users = new USERS_IMPL(settings, dataStore, tariffs, admins->GetSysAdmin());

 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());
 
 traffCnt = new TRAFFCOUNTER(users, tariffs, settings->GetRulesFileName());
 traffCnt->SetMonitorDir(settings->GetMonitorDir());