From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Wed, 24 Feb 2016 14:00:40 +0000 (+0100)
Subject: [Messaging] Use tzplatform_getenv() to get path to messaging DB.
X-Git-Tag: submit/tizen/20160225.051540^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2816c99af6e4662c84c720511e25bddaad43c3de;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Messaging] Use tzplatform_getenv() to get path to messaging DB.

[Verification] TCT pass rate did not change.

Change-Id: I6123428f1e2250298bcfe73339f475b2f87d660f
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
---

diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec
index 330c5c2f..355fcd60 100644
--- a/packaging/webapi-plugins.spec
+++ b/packaging/webapi-plugins.spec
@@ -293,6 +293,7 @@ BuildRequires: pkgconfig(capi-appfw-app-manager)
 BuildRequires: pkgconfig(capi-appfw-package-manager)
 BuildRequires: pkgconfig(capi-content-media-content)
 BuildRequires: pkgconfig(capi-media-metadata-extractor)
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %if %{with wayland}
 %define display_type wayland
diff --git a/src/messaging/messaging.gyp b/src/messaging/messaging.gyp
index 7c76c443..7edb5a62 100644
--- a/src/messaging/messaging.gyp
+++ b/src/messaging/messaging.gyp
@@ -22,6 +22,7 @@
             'tapi',
             'vconf',
             'db-util',
+            'libtzplatform-config',
         ],
       },
       'sources': [
diff --git a/src/messaging/messaging_database_manager.cc b/src/messaging/messaging_database_manager.cc
index 24528238..74a0b468 100755
--- a/src/messaging/messaging_database_manager.cc
+++ b/src/messaging/messaging_database_manager.cc
@@ -24,6 +24,7 @@
 
 #include <msg_storage.h>
 #include <email-api.h>
+#include <tzplatform_config.h>
 
 #include "common/logger.h"
 #include "common/platform_exception.h"
@@ -204,7 +205,11 @@ msg_error_t MessagingDatabaseManager::connect()
         char strDBName[64];
 
         memset(strDBName, 0x00, sizeof(strDBName));
-        snprintf(strDBName, sizeof(strDBName), "%s", MSG_DB_NAME);
+        snprintf(strDBName, sizeof(strDBName), "%s/%s",
+                 tzplatform_getenv(TZ_SYS_DB), MSG_DB_NAME);
+
+        // this should match MSGFW_DB_NAME defined in msg-service/include/utils/MsgSqliteWrapper.h
+        SLoggerD("Using database: [%s]", strDBName);
 
         int err = db_util_open(strDBName, &sqlHandle, DB_UTIL_REGISTER_HOOK_METHOD);
 
diff --git a/src/messaging/messaging_database_manager.h b/src/messaging/messaging_database_manager.h
index 561de9af..91977c11 100755
--- a/src/messaging/messaging_database_manager.h
+++ b/src/messaging/messaging_database_manager.h
@@ -32,7 +32,7 @@ namespace extension {
 namespace messaging {
 
 // =================================================================
-#define MSG_DB_NAME                     "/usr/dbspace/.msg_service.db"
+#define MSG_DB_NAME                     ".msg_service.db"
 #define MSG_MESSAGE_TABLE_NAME          "MSG_MESSAGE_TABLE"
 #define MSG_FOLDER_TABLE_NAME           "MSG_FOLDER_TABLE"
 #define MSG_ADDRESS_TABLE_NAME          "MSG_ADDRESS_TABLE"