From ab3114332edf5257a6969a29e189e0d0d4e7001e Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Fri, 16 Jun 2017 09:47:04 +0900 Subject: [PATCH] Fix filter condition collate bug Fixed an issue where the collate option does not apply Change-Id: I25ee4d75521a555d7804c038d763979ee1d19a8f Signed-off-by: Minje Ahn --- include/media_info_private.h | 2 +- include_product/media_info_private.h | 2 +- packaging/capi-content-media-content.spec | 2 +- src/media_db.c | 1 - src/media_filter.c | 3 +++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index cf99666..0f03f6b 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -644,7 +644,7 @@ typedef struct _media_content_cb_data { #define SELECT_MEDIA_STORAGE_ID_BY_ID "SELECT storage_uuid FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q'" /* Delete */ -#define DELETE_MEDIA_FROM_MEDIA_BATCH "DELETE FROM '%s' WHERE %s" +#define DELETE_MEDIA_FROM_MEDIA_BATCH "DELETE FROM '%s' WHERE (%s" #define DELETE_PLAYLIST_FROM_PLAYLIST "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d" #define DELETE_TAG_FROM_TAG "DELETE FROM "DB_TABLE_TAG" WHERE tag_id=%d" #define DELETE_BOOKMARK_FROM_BOOKMARK "DELETE FROM "DB_TABLE_BOOKMARK" WHERE bookmark_id=%d" diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 18458b4..c6577ff 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -814,7 +814,7 @@ typedef struct _media_content_scan_cb_data_v2 { #define SELECT_MEDIA_STORAGE_ID_BY_ID "SELECT storage_uuid FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q'" /* Delete */ -#define DELETE_MEDIA_FROM_MEDIA_BATCH "DELETE FROM '%s' WHERE %s" +#define DELETE_MEDIA_FROM_MEDIA_BATCH "DELETE FROM '%s' WHERE (%s" #define DELETE_PLAYLIST_FROM_PLAYLIST "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d" #define DELETE_TAG_FROM_TAG "DELETE FROM "DB_TABLE_TAG" WHERE tag_id=%d" #define DELETE_BOOKMARK_FROM_BOOKMARK "DELETE FROM "DB_TABLE_BOOKMARK" WHERE bookmark_id=%d" diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 616bdfa..16ede16 100755 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.3.14 +Version: 0.3.15 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_db.c b/src/media_db.c index 7b689a8..cfea9a8 100755 --- a/src/media_db.c +++ b/src/media_db.c @@ -216,7 +216,6 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select SAFE_STRLCAT(bracket_added_condition, QUERY_KEYWORD_OPEN_BRACKET, sizeof(bracket_added_condition)); SAFE_STRLCAT(bracket_added_condition, _filter->condition, sizeof(bracket_added_condition)); - SAFE_STRLCAT(bracket_added_condition, QUERY_KEYWORD_BRACKET, sizeof(bracket_added_condition)); ret = _media_filter_attribute_generate(attr, bracket_added_condition, _filter->condition_collate_type, condition_query); media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); diff --git a/src/media_filter.c b/src/media_filter.c index 0197deb..451e5c3 100755 --- a/src/media_filter.c +++ b/src/media_filter.c @@ -752,6 +752,9 @@ int _media_filter_attribute_generate(attribute_h attr, char *condition, media_co SAFE_STRLCAT(*generated_condition, SPACE, size); } + /* Always close in here (condition collate option issue)*/ + SAFE_STRLCAT(*generated_condition, QUERY_KEYWORD_BRACKET, size); + /* media_content_debug("statement : %s(%d) (total:%d)", *generated_condition, strlen(*generated_condition), total_str_size); */ media_content_sec_debug("Condition : %s", *generated_condition); -- 2.7.4