From babfcf8b9791df4647d4fe5865039e0795241238 Mon Sep 17 00:00:00 2001
From: Zbigniew Kostrzewa <z.kostrzewa@samsung.com>
Date: Fri, 12 Apr 2013 14:39:04 +0200
Subject: [PATCH] Make getPkgName() return package name instead of full
 application id.

[Issue#] N/A
[Problem] WidgetDAOReadOnly::getPkgName() returns full id of the widget
instead of only its package name.
[Cause] N/A
[Solution] Return only package name from getPkgName().
[SCMRequest] N/A

[Verification]
1. Build respository.
2. Run `wrt-commons-tests-dao --output=text`.

Change-Id: I9f7ca02c255081e57f05e40b79cf7fd93968f647
---
 modules/widget_dao/dao/widget_dao_read_only.cpp | 27 ++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/modules/widget_dao/dao/widget_dao_read_only.cpp b/modules/widget_dao/dao/widget_dao_read_only.cpp
index 960a322..2afc1b9 100755
--- a/modules/widget_dao/dao/widget_dao_read_only.cpp
+++ b/modules/widget_dao/dao/widget_dao_read_only.cpp
@@ -155,6 +155,27 @@ TizenAppId getTizenAppIdByPkgId(const TizenPkgId tzPkgid)
     }
     SQL_CONNECTION_EXCEPTION_HANDLER_END("Failed in getHandle")
 }
+
+WidgetPkgName getTizenPkgIdByHandle(const DbWidgetHandle handle)
+{
+    LogDebug("Getting TizenPkgId by DbWidgetHandle: " << handle);
+
+    SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
+    {
+        WRT_DB_SELECT(select, WidgetInfo, &WrtDatabase::interface())
+        select->Where(Equals<WidgetInfo::app_id>(handle));
+        WidgetInfo::Select::RowList rowList = select->GetRowList();
+
+        if (rowList.empty()) {
+            ThrowMsg(WidgetDAOReadOnly::Exception::WidgetNotExist,
+                     "Failed to get widget by handle");
+        }
+        WidgetPkgName tzPkgid = rowList.front().Get_tizen_pkgid();
+
+        return tzPkgid;
+    }
+    SQL_CONNECTION_EXCEPTION_HANDLER_END("Failed in getHandle")
+}
 } // namespace
 
 IWacSecurity::~IWacSecurity()
@@ -220,17 +241,17 @@ DbWidgetHandle WidgetDAOReadOnly::getHandle(const DPL::String tzAppId)
 
 WidgetPkgName WidgetDAOReadOnly::getPkgName() const
 {
-    return getTzAppId();
+    return getTizenPkgIdByHandle(m_widgetHandle);
 }
 
 WidgetPkgName WidgetDAOReadOnly::getPkgName(const WidgetGUID GUID)
 {
-    return getTzAppId(GUID);
+    return getTizenPkgIdByHandle(getHandle(GUID));
 }
 
 WidgetPkgName WidgetDAOReadOnly::getPkgName(const DbWidgetHandle handle)
 {
-    return getTzAppId(handle);
+    return getTizenPkgIdByHandle(handle);
 }
 
 TizenAppId WidgetDAOReadOnly::getTzAppId() const
-- 
2.7.4