From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Tue, 13 Jan 2015 12:42:29 +0000 (+0100)
Subject: Fix x_slp_svc query for multiple app control entries
X-Git-Tag: accepted/tizen/3.0.2015.q1/common/20150317.132304~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e5daf3e151cc611ac492d0bf2a19ee77bf99867;p=platform%2Fcore%2Fappfw%2Fapp-svc.git

Fix x_slp_svc query for multiple app control entries

Change-Id: Ib87220659037bbbff59c009d76524bc852fa2515
---

diff --git a/src/appsvc.c b/src/appsvc.c
index f6d6766..0a34096 100644
--- a/src/appsvc.c
+++ b/src/appsvc.c
@@ -703,7 +703,7 @@ SLPAPI int appsvc_usr_run_service(bundle *b, int request_code, appsvc_res_fn cbf
 	if(ret < 0)
 		return ret;
 
-	_D("op - %s / mime - %s / shceme - %s\n", info.op, info.origin_mime, info.scheme);
+	_D("op - %s / mime - %s / scheme - %s\n", info.op, info.origin_mime, info.scheme);
 
 	/*uri*/
 	pkgname = _svc_db_get_app(info.op, info.origin_mime, info.uri, uid);
@@ -888,7 +888,7 @@ SLPAPI int appsvc_usr_get_list(bundle *b, appsvc_info_iter_fn iter_fn, void *dat
 	if(ret < 0)
 		return ret;
 	
-	_D("operation - %s / shceme - %s / mime - %s\n", info.op, info.scheme, info.mime);
+	_D("operation - %s / scheme - %s / mime - %s\n", info.op, info.scheme, info.mime);
 
 	__get_list_with_condition_mime_extened_with_collation(info.op, info.uri,
 			info.mime, info.m_type, info.s_type, &pkg_list, uid);
diff --git a/src/appsvc_db.c b/src/appsvc_db.c
index 1629ea2..1190e06 100755
--- a/src/appsvc_db.c
+++ b/src/appsvc_db.c
@@ -472,7 +472,7 @@ int _svc_db_get_list_with_collation(char *op, char *uri, char *mime, GSList **pk
 	if(__init_app_info_db(uid)<0)
 		return 0;
 
-	snprintf(query, QUERY_MAX_LEN, "select package from app_info where x_slp_svc='%s|%s|%s' collate appsvc_collation", op,uri,mime);
+	snprintf(query, QUERY_MAX_LEN, "select package from app_info where x_slp_svc like '%%%s|%s|%s%%'", op, uri ? uri : "NULL", mime);
 	_D("query : %s\n",query);
 
 	ret = sqlite3_prepare(app_info_db, query, strlen(query), &stmt, NULL);