#include <dpl/wrt-dao-ro/WrtDatabase.h>
#include <dpl/wrt-dao-ro/widget_config.h>
#include <dpl/wrt-dao-ro/global_config.h>
+#include <dpl/wrt-dao-ro/common_dao_types.h>
#include <sys/stat.h>
#include <fstream>
const char* const SECURITY_ORIGIN_DB_SQL_PATH =
"/usr/share/wrt-engine/security_origin_db.sql";
-std::string createDatabasePath(int widgetHandle)
+std::string createDatabasePath(const WrtDB::WidgetPkgName &pkgName)
{
- using namespace DPL::DB::ORM;
- using namespace WrtDB::WidgetConfig;
- using namespace WrtDB::GlobalConfig;
-
- SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
- {
std::stringstream filename;
- WrtDB::WidgetDAOReadOnly widgetDAO(widgetHandle);
- WrtDB::WidgetPkgName pkgname = widgetDAO.getPkgname_TEMPORARY_API();
- filename << GetWidgetPersistentStoragePath(pkgname)
+ filename << WrtDB::WidgetConfig::GetWidgetPersistentStoragePath(pkgName)
<< "/"
<< SECURITY_ORIGIN_DB_NAME;
return filename.str();
- }
- SQL_CONNECTION_EXCEPTION_HANDLER_END("Fail to get database Path")
-
}
-std::string createDatabasePath(const DPL::String& tizenId)
+std::string createDatabasePath(int widgetHandle)
{
using namespace DPL::DB::ORM;
using namespace WrtDB::WidgetConfig;
using namespace WrtDB::GlobalConfig;
- SQL_CONNECTION_EXCEPTION_HANDLER_BEGIN
+ WrtDB::TizenAppId appid;
+
+ Try
{
- std::stringstream filename;
- filename << GetWidgetPersistentStoragePath(tizenId)
- << "/"
- << SECURITY_ORIGIN_DB_NAME;
- return filename.str();
+ appid = WrtDB::WidgetDAOReadOnly::getTzAppId(widgetHandle);
}
- SQL_CONNECTION_EXCEPTION_HANDLER_END("Fail to get database Path")
-
+ Catch(DPL::DB::SqlConnection::Exception::Base) {
+ LogError("Failed to get database Path");
+ }
+ return createDatabasePath(appid);
}
void checkDatabase(std::string databasePath)
m_securityOriginDBInterface.AttachToThread(SECURITY_ORIGIN_DB_OPTION);
}
-SecurityOriginDAO::SecurityOriginDAO(const DPL::String& tizenId):
- m_securityOriginDBPath(createDatabasePath(tizenId)),
+SecurityOriginDAO::SecurityOriginDAO(const WrtDB::WidgetPkgName &pkgName) :
+ m_securityOriginDBPath(createDatabasePath(pkgName)),
m_securityOriginDBInterface(m_securityOriginDBPath, SECURITY_ORIGIN_DB_TYPE)
{
checkDatabase(m_securityOriginDBPath);