X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fpkgmgrinfo_private.c;h=5fb89a88f7c7089f438b655033b0de00d8cd8143;hb=e73ca5db27eb2e4f133665f389a88fd5d8c8167e;hp=b7809f870c519ea7d0a1b04b84ecd1f9b2a0a081;hpb=9cbdda4a8e804a747a5ddc5a863b230234553043;p=platform%2Fcore%2Fappfw%2Fpkgmgr-info.git

diff --git a/src/pkgmgrinfo_private.c b/src/pkgmgrinfo_private.c
index b7809f8..5fb89a8 100644
--- a/src/pkgmgrinfo_private.c
+++ b/src/pkgmgrinfo_private.c
@@ -78,7 +78,8 @@ static struct _pkginfo_bool_map_t pkginfo_bool_prop_map[] = {
 	{E_PMINFO_PKGINFO_PROP_PACKAGE_NODISPLAY_SETTING,	PMINFO_PKGINFO_PROP_PACKAGE_NODISPLAY_SETTING},
 	{E_PMINFO_PKGINFO_PROP_PACKAGE_SUPPORT_DISABLE,	PMINFO_PKGINFO_PROP_PACKAGE_SUPPORT_DISABLE},
 	{E_PMINFO_PKGINFO_PROP_PACKAGE_DISABLE,	PMINFO_PKGINFO_PROP_PACKAGE_DISABLE},
-	{E_PMINFO_PKGINFO_PROP_PACKAGE_CHECK_STORAGE,	PMINFO_PKGINFO_PROP_PACKAGE_CHECK_STORAGE}
+	{E_PMINFO_PKGINFO_PROP_PACKAGE_CHECK_STORAGE,	PMINFO_PKGINFO_PROP_PACKAGE_CHECK_STORAGE},
+	{E_PMINFO_PKGINFO_PROP_PACKAGE_SYSTEM,		PMINFO_PKGINFO_PROP_PACKAGE_SYSTEM}
 };
 
 struct _appinfo_str_map_t {
@@ -99,7 +100,8 @@ static struct _appinfo_str_map_t appinfo_str_prop_map[] = {
 	{E_PMINFO_APPINFO_PROP_APP_HWACCELERATION,	PMINFO_APPINFO_PROP_APP_HWACCELERATION},
 	{E_PMINFO_APPINFO_PROP_APP_SCREENREADER,	PMINFO_APPINFO_PROP_APP_SCREENREADER},
 	{E_PMINFO_APPINFO_PROP_APP_PACKAGE,	PMINFO_APPINFO_PROP_APP_PACKAGE},
-	{E_PMINFO_APPINFO_PROP_APP_INSTALLED_STORAGE,	PMINFO_APPINFO_PROP_APP_INSTALLED_STORAGE}
+	{E_PMINFO_APPINFO_PROP_APP_INSTALLED_STORAGE,	PMINFO_APPINFO_PROP_APP_INSTALLED_STORAGE},
+	{E_PMINFO_APPINFO_PROP_PRIVILEGE,	PMINFO_APPINFO_PROP_PRIVILEGE}
 };
 
 struct _appinfo_int_map_t {
@@ -126,7 +128,8 @@ static struct _appinfo_bool_map_t appinfo_bool_prop_map[] = {
 	{E_PMINFO_APPINFO_PROP_APP_UI_GADGET,		PMINFO_APPINFO_PROP_APP_UI_GADGET},
 	{E_PMINFO_APPINFO_PROP_APP_SUPPORT_DISABLE,		PMINFO_APPINFO_PROP_APP_SUPPORT_DISABLE},
 	{E_PMINFO_APPINFO_PROP_APP_DISABLE,		PMINFO_APPINFO_PROP_APP_DISABLE},
-	{E_PMINFO_APPINFO_PROP_APP_CHECK_STORAGE,		PMINFO_APPINFO_PROP_APP_CHECK_STORAGE}
+	{E_PMINFO_APPINFO_PROP_APP_CHECK_STORAGE,		PMINFO_APPINFO_PROP_APP_CHECK_STORAGE},
+	{E_PMINFO_APPINFO_PROP_PKG_DISABLE,		PMINFO_APPINFO_PROP_PKG_DISABLE}
 };
 
 inline pkgmgrinfo_pkginfo_filter_prop_str _pminfo_pkginfo_convert_to_prop_str(const char *property)
@@ -245,7 +248,6 @@ int __get_filter_condition(gpointer data, uid_t uid, char **condition, GList **p
 	char *value;
 	char *ptr = NULL;
 	char *saveptr = NULL;
-	size_t len = 0;
 
 	switch (node->prop) {
 	case E_PMINFO_PKGINFO_PROP_PACKAGE_ID:
@@ -303,6 +305,9 @@ int __get_filter_condition(gpointer data, uid_t uid, char **condition, GList **p
 	case E_PMINFO_PKGINFO_PROP_PACKAGE_DISABLE:
 		snprintf(buf, sizeof(buf), "pi.package_disable=? COLLATE NOCASE");
 		break;
+	case E_PMINFO_PKGINFO_PROP_PACKAGE_SYSTEM:
+		snprintf(buf, sizeof(buf), "pi.package_system=? COLLATE NOCASE");
+		break;
 
 	case E_PMINFO_APPINFO_PROP_APP_ID:
 		snprintf(buf, sizeof(buf), "ai.app_id=?");
@@ -344,16 +349,13 @@ int __get_filter_condition(gpointer data, uid_t uid, char **condition, GList **p
 			free(value);
 			return 0;
 		}
-		strncat(buf, "?", MAX_QUERY_LEN - len - 1);
-		len += strlen("?");
+		strncat(buf, "?", sizeof(buf) - strlen(buf) - 1);
 		*params = g_list_append(*params, strdup(ptr));
 		while ((ptr = strtok_r(NULL, ",", &saveptr))) {
-			strncat(buf, ", ?", MAX_QUERY_LEN - len - 1);
-			len += strlen(", ?");
+			strncat(buf, ", ?", sizeof(buf) - strlen(buf) - 1);
 			*params = g_list_append(*params, strdup(ptr));
 		}
-		strncat(buf, ")", MAX_QUERY_LEN - len - 1);
-		len += strlen("?");
+		strncat(buf, ")", sizeof(buf) - strlen(buf) - 1);
 		*condition = strdup(buf);
 		flag = E_PMINFO_APPINFO_JOIN_CATEGORY;
 		free(value);
@@ -394,18 +396,21 @@ int __get_filter_condition(gpointer data, uid_t uid, char **condition, GList **p
 		break;
 	case E_PMINFO_APPINFO_PROP_APP_DISABLE:
 		if (strcasecmp(node->value, "true") == 0)
-			snprintf(buf, MAX_QUERY_LEN, "(ai.app_disable=? COLLATE NOCASE OR "
-					"ai.app_id IN (SELECT app_id FROM package_app_info_for_uid "
-					"WHERE uid=%d AND is_disabled='true'))", uid);
+			snprintf(buf, MAX_QUERY_LEN, "(ai.app_disable=? COLLATE NOCASE " \
+					"OR ui.is_disabled='true' COLLATE NOCASE)");
 		else
-			snprintf(buf, MAX_QUERY_LEN, "(ai.app_disable=? COLLATE NOCASE AND "
-					"ai.app_id NOT IN (SELECT app_id FROM package_app_info_for_uid "
-					"WHERE uid=%d AND is_disabled='true'))", uid);
-		flag = E_PMINFO_APPINFO_JOIN_APPINFO_FOR_UID;
+			snprintf(buf, MAX_QUERY_LEN, "(ai.app_disable=? COLLATE NOCASE " \
+					"AND (ui.is_disabled='false' COLLATE NOCASE " \
+					"OR ui.is_disabled IS NULL))");
 		break;
 	case E_PMINFO_APPINFO_PROP_APP_SUPPORT_DISABLE:
 		snprintf(buf, MAX_QUERY_LEN, "ai.app_support_disable=? COLLATE NOCASE");
 		break;
+	case E_PMINFO_APPINFO_PROP_PKG_DISABLE:
+		snprintf(buf, MAX_QUERY_LEN,
+				"ai.package IN (SELECT package FROM " \
+				"package_info WHERE package_disable=?)");
+		break;
 	case E_PMINFO_APPINFO_PROP_APP_SUPPORT_MODE:
 		snprintf(buf, sizeof(buf), "ai.app_support_mode=?");
 		break;
@@ -413,6 +418,10 @@ int __get_filter_condition(gpointer data, uid_t uid, char **condition, GList **p
 	case E_PMINFO_APPINFO_PROP_APP_CHECK_STORAGE:
 		*condition = NULL;
 		return 0;
+	case E_PMINFO_APPINFO_PROP_PRIVILEGE:
+		snprintf(buf, sizeof(buf), "package_privilege_info.privilege=?");
+		flag = E_PMINFO_APPINFO_JOIN_PRIVILEGE;
+		break;
 	default:
 		_LOGE("Invalid Property Type\n");
 		*condition = NULL;
@@ -428,17 +437,12 @@ int __get_metadata_filter_condition(gpointer data, char **condition,
 {
 	pkgmgrinfo_metadata_node_x *node = (pkgmgrinfo_metadata_node_x *)data;
 	char buf[MAX_QUERY_LEN];
-	size_t len = 0;
 
 	snprintf(buf, sizeof(buf), "(package_app_app_metadata.md_key=?");
-	len += strlen("(package_app_app_metadata.md_key=?");
-	if (node->value) {
+	if (node->value)
 		strncat(buf, " AND package_app_app_metadata.md_value=?",
-				sizeof(buf) - len - 1);
-		len += strlen(" AND package_app_app_metadata.md_value=?");
-	}
-	strncat(buf, ")", sizeof(buf) - len - 1);
-	len += strlen(")");
+				sizeof(buf) - strlen(buf) - 1);
+	strncat(buf, ")", sizeof(buf) - strlen(buf) - 1);
 
 	*condition = strdup(buf);
 	*params = g_list_append(*params, strdup(node->key));
@@ -552,7 +556,7 @@ int __appinfo_check_installed_storage(application_x *appinfo)
 }
 
 #define BUSY_WAITING_USEC (1000000 / 10 / 2) /* 0.05 sec */
-#define BUSY_WAITING_MAX 20 /* wait for max 1 sec */
+#define BUSY_WAITING_MAX 40 /* wait for max 2 sec */
 static int __db_busy_handler(void *data, int count)
 {
 	if (count < BUSY_WAITING_MAX) {