Fix postgresql store plugin compilation errors

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
index fc15d035fd787883a1da5bf5a4e24c63e2d415cf..fd0ebf5e13904ed956d095c14d22ae9957254f1f 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.cpp
@@ -46,7 +46,7 @@
 
 #include "postgresql_store.h"
 #include "postgresql_store_utils.h"
 
 #include "postgresql_store.h"
 #include "postgresql_store_utils.h"

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

 
 class POSTGRESQL_STORE_CREATOR
 {
 
 class POSTGRESQL_STORE_CREATOR
 {

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store.h b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
index d273803df0ec235536328fb95eae774e37b1a3e3..a32b155eb69448229685b4d79085aba5a6b34f24 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store.h
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store.h
@@ -35,7 +35,7 @@
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
 

-#include "store.h"
+#include "stg/store.h"

 
 // Minimal DB version is 5
 // Recommended DB version is 6 (support FreeMb logging on disconnects)
 
 // Minimal DB version is 5
 // Recommended DB version is 6 (support FreeMb logging on disconnects)

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp
index 42db6c12949b71487f513d8354bda0489479b435..9670ce83888cd042a52f9a1eef184c1f3cee4da5 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_admins.cpp
@@ -32,10 +32,10 @@
 
 #include <libpq-fe.h>
 
 
 #include <libpq-fe.h>
 

+#include "stg/stg_locker.h"
+#include "stg/admin_conf.h"
+#include "stg/blowfish.h"

 #include "postgresql_store.h"
 #include "postgresql_store.h"

-#include "stg_locker.h"
-#include "admin_conf.h"
-#include "blowfish.h"

 
 #define adm_enc_passwd "cjeifY8m3"
 
 
 #define adm_enc_passwd "cjeifY8m3"
 

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp
index 6fa3fd500f74ca594bfe5246af74383c4fd21c52..08848ea49cb26b0e946bbcead31569c1dcde59a8 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_corporations.cpp
@@ -33,7 +33,7 @@
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"

-#include "stg_locker.h"
+#include "stg/stg_locker.h"

 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetCorpsList(vector<string> * corpsList) const
 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetCorpsList(vector<string> * corpsList) const

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp
index 9eeea602c8905eed646503b0683b2081718946ec..e4c87cdd7b2bfea94aac8e70f81064aa521583f0 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_messages.cpp
@@ -34,8 +34,8 @@
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"

-#include "stg_locker.h"
-#include "stg_message.h"
+#include "stg/stg_locker.h"
+#include "stg/stg_message.h"

 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::AddMessage(STG_MSG * msg, const string & login) const
 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::AddMessage(STG_MSG * msg, const string & login) const

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp
index 88b8049c13a40e1bbab70e61f5177917c5b85085..82a999f7058a3ab1b110d2e8d7d6804365c8d744 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_services.cpp
@@ -34,7 +34,7 @@
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"

-#include "stg_locker.h"
+#include "stg/stg_locker.h"

 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetServicesList(vector<string> * servicesList) const
 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetServicesList(vector<string> * servicesList) const

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
index 352dab00ba44508c901741d154f0738b666c25bb..fc35f7889092e7141207dce4e8a173b80b07d64c 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_tariffs.cpp
@@ -33,7 +33,7 @@
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"
 #include <libpq-fe.h>
 
 #include "postgresql_store.h"

-#include "stg_locker.h"
+#include "stg/stg_locker.h"

 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetTariffsList(vector<string> * tariffsList) const
 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetTariffsList(vector<string> * tariffsList) const

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp
index 7d8b3b939fa25559d1c9acb9b5860766c52cc98b..c1c48e250673c141f816cec40c0e77c087fa5363 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_users.cpp
@@ -33,10 +33,10 @@
 
 #include <libpq-fe.h>
 
 
 #include <libpq-fe.h>
 

-#include "stg_const.h"
-#include "postgresql_store.h"
-#include "stg_locker.h"
+#include "stg/stg_const.h"
+#include "stg/stg_locker.h"

 #include "../../../stg_timer.h"
 #include "../../../stg_timer.h"

+#include "postgresql_store.h"

 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetUsersList(vector<string> * usersList) const
 
 //-----------------------------------------------------------------------------
 int POSTGRESQL_STORE::GetUsersList(vector<string> * usersList) const

diff --git a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp
index 7c0755a7e3121d9f74c8020d82aa8ba9772e40d2..c36df0cd02efa1600ee39f032315f6c970585abe 100644 (file)
--- a/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp
+++ b/projects/stargazer/plugins/store/postgresql/postgresql_store_utils.cpp
@@ -31,8 +31,7 @@
 
 #include <libpq-fe.h>
 
 
 #include <libpq-fe.h>
 

-#include "common.h"
-
+#include "stg/common.h"

 #include "postgresql_store.h"
 
 int POSTGRESQL_STORE::StartTransaction() const
 #include "postgresql_store.h"
 
 int POSTGRESQL_STORE::StartTransaction() const