From: Sangyoon Jang Date: Mon, 9 Nov 2015 08:30:28 +0000 (+0900) Subject: Remove package_app_app_svc X-Git-Tag: accepted/tizen/mobile/20151109.234051^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d8bfe313d9764982eeeb34cff88ac32191e59e09;p=platform%2Fcore%2Fappfw%2Fpkgmgr-info.git Remove package_app_app_svc remove package_app_app_svc table and related codes app_svc(application-service) tag is replaced with app_control(app-control) Change-Id: I9f62fc1b32f36558ef0e35451591f24ff534b6d6 Signed-off-by: Sangyoon Jang --- diff --git a/include/pkgmgrinfo_basic.h b/include/pkgmgrinfo_basic.h index c08b1b4..a588126 100644 --- a/include/pkgmgrinfo_basic.h +++ b/include/pkgmgrinfo_basic.h @@ -74,14 +74,6 @@ typedef struct notification_x { const char *text; } notification_x; -typedef struct appsvc_x { - const char *text; - const char *operation; - const char *uri; - const char *mime; - const char *subapp; -} appsvc_x; - typedef struct appcontrol_x { const char *operation; const char *uri; @@ -133,7 +125,6 @@ typedef struct application_x { GList *label; GList *icon; GList *image; - GList *appsvc; GList *appcontrol; GList *category; GList *metadata; diff --git a/parser/pkgmgr_parser_db.c b/parser/pkgmgr_parser_db.c index a469d44..b025fce 100644 --- a/parser/pkgmgr_parser_db.c +++ b/parser/pkgmgr_parser_db.c @@ -183,17 +183,6 @@ sqlite3 *pkgmgr_cert_db; "REFERENCES package_app_info(app_id) " \ "ON DELETE CASCADE)" -#define QUERY_CREATE_TABLE_PACKAGE_APP_APP_SVC "create table if not exists package_app_app_svc " \ - "(app_id text not null, " \ - "operation text not null, " \ - "uri_scheme text, " \ - "mime_type text, " \ - "subapp_name text, " \ - "PRIMARY KEY(app_id,operation,uri_scheme,mime_type,subapp_name) " \ - "FOREIGN KEY(app_id) " \ - "REFERENCES package_app_info(app_id) " \ - "ON DELETE CASCADE)" - #define QUERY_CREATE_TABLE_PACKAGE_APP_APP_CATEGORY "create table if not exists package_app_app_category " \ "(app_id text not null, " \ "category text not null, " \ @@ -267,7 +256,6 @@ sqlite3 *pkgmgr_cert_db; "ON DELETE CASCADE)" static int __insert_application_info(manifest_x *mfx); -static int __insert_application_appsvc_info(manifest_x *mfx); static int __insert_application_appcategory_info(manifest_x *mfx); static int __insert_application_appcontrol_info(manifest_x *mfx); static int __insert_application_appmetadata_info(manifest_x *mfx); @@ -1024,43 +1012,6 @@ static int __insert_application_appcontrol_info(manifest_x *mfx) return 0; } -/* FIXME: should be changed to app_control */ -static int __insert_application_appsvc_info(manifest_x *mfx) -{ - GList *app_tmp; - application_x *app; - GList *asvc_tmp; - appsvc_x *asvc; - int ret = -1; - char query[MAX_QUERY_LEN] = {'\0'}; - for (app_tmp = mfx->application; app_tmp; app_tmp = app_tmp->next) { - app = (application_x *)app_tmp->data; - if (app == NULL) - continue; - for (asvc_tmp = app->appsvc; asvc_tmp; asvc_tmp = asvc_tmp->next) { - asvc = (appsvc_x *)asvc_tmp->data; - if (asvc == NULL) - continue; - snprintf(query, MAX_QUERY_LEN, - "insert into package_app_app_svc(app_id, operation, uri_scheme, mime_type, subapp_name) " \ - "values('%s', '%s', '%s', '%s', '%s')",\ - app->appid, - asvc->operation, - __get_str(asvc->uri), - __get_str(asvc->mime), - __get_str(asvc->subapp)); - - ret = __exec_query(query); - if (ret == -1) { - _LOGD("Package UiApp AppSvc DB Insert Failed\n"); - return -1; - } - memset(query, '\0', MAX_QUERY_LEN); - } - } - return 0; -} - static int __insert_application_datacontrol_info(manifest_x *mfx) { GList *app_tmp; @@ -1345,11 +1296,6 @@ static int __insert_manifest_info_in_db(manifest_x *mfx, uid_t uid) if (ret == -1) return -1; - /*Insert in the package_app_app_svc DB*/ - ret = __insert_application_appsvc_info(mfx); - if (ret == -1) - return -1; - /*Insert in the package_app_share_allowed DB*/ ret = __insert_application_share_allowed_info(mfx); if (ret == -1) @@ -1400,9 +1346,6 @@ static int __delete_subpkg_info_from_db(char *appid) ret = __delete_appinfo_from_db("package_app_image_info", appid); if (ret < 0) return ret; - ret = __delete_appinfo_from_db("package_app_app_svc", appid); - if (ret < 0) - return ret; ret = __delete_appinfo_from_db("package_app_app_control", appid); if (ret < 0) return ret; @@ -1506,9 +1449,6 @@ static int __delete_manifest_info_from_db(manifest_x *mfx, uid_t uid) ret = __delete_appinfo_from_db("package_app_image_info", app->appid); if (ret < 0) return ret; - ret = __delete_appinfo_from_db("package_app_app_svc", app->appid); - if (ret < 0) - return ret; ret = __delete_appinfo_from_db("package_app_app_control", app->appid); if (ret < 0) return ret; @@ -1611,11 +1551,6 @@ API int pkgmgr_parser_initialize_db(uid_t uid) _LOGD("package app app permission DB initialization failed\n"); return ret; } - ret = __initialize_db(pkgmgr_parser_db, QUERY_CREATE_TABLE_PACKAGE_APP_APP_SVC); - if (ret == -1) { - _LOGD("package app app svc DB initialization failed\n"); - return ret; - } ret = __initialize_db(pkgmgr_parser_db, QUERY_CREATE_TABLE_PACKAGE_APP_SHARE_ALLOWED); if (ret == -1) { _LOGD("package app share allowed DB initialization failed\n"); diff --git a/src/pkgmgrinfo_appinfo.c b/src/pkgmgrinfo_appinfo.c index 97e9896..4e7384a 100644 --- a/src/pkgmgrinfo_appinfo.c +++ b/src/pkgmgrinfo_appinfo.c @@ -94,8 +94,8 @@ static gint _appinfo_get_list(sqlite3 *db, const char *locale, " AND package_app_localized_info.app_locale=%Q" " LEFT OUTER JOIN package_app_app_category" " ON package_app_info.app_id=package_app_app_category.app_id" - " LEFT OUTER JOIN package_app_app_svc" - " ON package_app_info.app_id=package_app_app_svc.app_id " + " LEFT OUTER JOIN package_app_app_control" + " ON package_app_info.app_id=package_app_app_control.app_id" " LEFT OUTER JOIN package_app_app_metadata" " ON package_app_info.app_id=package_app_app_metadata.app_id "; int ret; diff --git a/src/pkgmgrinfo_basic.c b/src/pkgmgrinfo_basic.c index a37a30b..51d8052 100644 --- a/src/pkgmgrinfo_basic.c +++ b/src/pkgmgrinfo_basic.c @@ -118,28 +118,6 @@ static void __ps_free_appcontrol(gpointer data) free((void*)appcontrol); } -static void __ps_free_appsvc(gpointer data) -{ - appsvc_x *appsvc = (appsvc_x *)data; - if (appsvc == NULL) - return; - if (appsvc->text) - free((void *)appsvc->text); - /*Free Operation*/ - if (appsvc->operation) - free((void *)appsvc->operation); - /*Free Uri*/ - if (appsvc->uri) - free((void *)appsvc->uri); - /*Free Mime*/ - if (appsvc->mime) - free((void *)appsvc->mime); - /*Free subapp*/ - if (appsvc->subapp) - free((void *)appsvc->subapp); - free((void*)appsvc); -} - static void __ps_free_define(gpointer data) { define_x *define = (define_x *)data; @@ -296,8 +274,6 @@ static void __ps_free_application(gpointer data) g_list_free_full(application->icon, __ps_free_icon); /*Free image*/ g_list_free_full(application->image, __ps_free_image); - /*Free AppSvc*/ - g_list_free_full(application->appsvc, __ps_free_appsvc); /*Free AppControl*/ g_list_free_full(application->appcontrol, __ps_free_appcontrol); /*Free Category*/ diff --git a/src/pkgmgrinfo_db.c b/src/pkgmgrinfo_db.c index d6928bd..14fc88d 100644 --- a/src/pkgmgrinfo_db.c +++ b/src/pkgmgrinfo_db.c @@ -310,7 +310,6 @@ static const char *parserdb_tables[] = { "package_app_share_allowed", "package_app_app_permission", "package_app_share_request", - "package_app_app_svc", "package_info", "package_app_data_control", "package_localized_info", diff --git a/src/pkgmgrinfo_private.c b/src/pkgmgrinfo_private.c index 450e35a..d695232 100644 --- a/src/pkgmgrinfo_private.c +++ b/src/pkgmgrinfo_private.c @@ -305,15 +305,15 @@ void __get_filter_condition(gpointer data, char **condition) break; case E_PMINFO_APPINFO_PROP_APP_OPERATION: snprintf(temp, sizeof(temp), "(%s)", node->value); - snprintf(buf, sizeof(buf), "package_app_app_svc.operation IN %s", temp); + snprintf(buf, sizeof(buf), "package_app_app_control.app_control LIKE %s|%%|%%", temp); break; case E_PMINFO_APPINFO_PROP_APP_URI: snprintf(temp, sizeof(temp), "(%s)", node->value); - snprintf(buf, sizeof(buf), "package_app_app_svc.uri_scheme IN %s", temp); + snprintf(buf, sizeof(buf), "package_app_app_control.app_control LIKE %%|%s|%%", temp); break; case E_PMINFO_APPINFO_PROP_APP_MIME: snprintf(temp, sizeof(temp), "(%s)", node->value); - snprintf(buf, sizeof(buf), "package_app_app_svc.mime_type IN %s", temp); + snprintf(buf, sizeof(buf), "package_app_app_control.app_control LIKE %%|%%|%s", temp); break; case E_PMINFO_APPINFO_PROP_APP_CATEGORY: snprintf(temp, sizeof(temp), "(%s)", node->value);