From: Minje Ahn Date: Wed, 3 Apr 2019 00:52:26 +0000 (+0900) Subject: Match columns of bookmark with filter keyword X-Git-Tag: accepted/tizen/unified/20190404.022029~2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F202692%2F1;p=platform%2Fcore%2Fapi%2Fmedia-content.git Match columns of bookmark with filter keyword Change-Id: I6d4eae52ca63f858321ff0001218ddac7db506d9 Signed-off-by: Minje Ahn --- diff --git a/include/media_info_private.h b/include/media_info_private.h index a928a0e..2580510 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -445,11 +445,6 @@ typedef struct _media_content_cb_data { #define DB_FIELD_TAG_NAME "name" #define DB_FIELD_TAG_MEDIA_COUNT "media_count" -/* DB field for bookmark */ -#define DB_FIELD_BOOKMARK_ID "bookmark_id" -#define DB_FIELD_BOOKMARK_MARKED_TIME "marked_time" -#define DB_FIELD_BOOKMARK_NAME "name" - /* DB field for Storage*/ #define DB_FIELD_STORAGE_ID "storage_uuid" #define DB_FIELD_STORAGE_PATH "storage_path" @@ -534,13 +529,13 @@ typedef struct _media_content_cb_data { #define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP "UPDATE "DB_TABLE_PLAYLIST_MAP" SET play_order=%d WHERE playlist_id=%d AND _id=%d;" /* Bookmark */ -#define INSERT_BOOKMARK_TO_BOOKMARK "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, marked_time, thumbnail_path, name) VALUES ('%q', '%d', %Q, %Q)" +#define INSERT_BOOKMARK_TO_BOOKMARK "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, bookmark_marked_time, thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)" #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'" -#define SELECT_BOOKMARK_LIST "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN -#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'" -#define SELECT_BOOKMARK_ID_FROM_BOOKMARK "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND marked_time=%d" +#define SELECT_BOOKMARK_LIST "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN +#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'" +#define SELECT_BOOKMARK_ID_FROM_BOOKMARK "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND bookmark_marked_time=%d" -#define UPDATE_BOOKMARK_FROM_BOOKMARK "UPDATE "DB_TABLE_BOOKMARK" SET name=%Q WHERE bookmark_id=%d;" +#define UPDATE_BOOKMARK_FROM_BOOKMARK "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;" /* Update Meta*/ #define UPDATE_IMAGE_META_FROM_MEDIA "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'" diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index d74d9b9..357a893 100755 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -558,11 +558,6 @@ typedef struct _media_content_scan_cb_data_v2 { #define DB_FIELD_TAG_NAME "name" #define DB_FIELD_TAG_MEDIA_COUNT "media_count" -/* DB field for bookmark */ -#define DB_FIELD_BOOKMARK_ID "bookmark_id" -#define DB_FIELD_BOOKMARK_MARKED_TIME "marked_time" -#define DB_FIELD_BOOKMARK_NAME "name" - /* DB field for Storage*/ #define DB_FIELD_STORAGE_ID "storage_uuid" #define DB_FIELD_STORAGE_PATH "storage_path" @@ -711,13 +706,13 @@ typedef struct _media_content_scan_cb_data_v2 { #define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP "UPDATE "DB_TABLE_PLAYLIST_MAP" SET play_order=%d WHERE playlist_id=%d AND _id=%d;" /* Bookmark */ -#define INSERT_BOOKMARK_TO_BOOKMARK "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, marked_time, thumbnail_path, name) VALUES ('%q', '%d', %Q, %Q)" +#define INSERT_BOOKMARK_TO_BOOKMARK "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, bookmark_marked_time, thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)" #define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'" -#define SELECT_BOOKMARK_LIST "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN -#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID "SELECT bookmark_id, b.media_uuid, marked_time, b.thumbnail_path, name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'" -#define SELECT_BOOKMARK_ID_FROM_BOOKMARK "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND marked_time=%d" +#define SELECT_BOOKMARK_LIST "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN +#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID "SELECT bookmark_id, b.media_uuid, bookmark_marked_time, b.thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND b.media_uuid='%s'" +#define SELECT_BOOKMARK_ID_FROM_BOOKMARK "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_uuid='%s' AND bookmark_marked_time=%d" -#define UPDATE_BOOKMARK_FROM_BOOKMARK "UPDATE "DB_TABLE_BOOKMARK" SET name=%Q WHERE bookmark_id=%d;" +#define UPDATE_BOOKMARK_FROM_BOOKMARK "UPDATE "DB_TABLE_BOOKMARK" SET bookmark_name=%Q WHERE bookmark_id=%d;" /* Update Meta*/ #define UPDATE_IMAGE_META_FROM_MEDIA "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'" diff --git a/src/media_content.c b/src/media_content.c index 5a6119a..6e1a00c 100755 --- a/src/media_content.c +++ b/src/media_content.c @@ -109,11 +109,6 @@ static media_content_attribute_info_s g_content_attrs_info[] = { /* Tag View */ {TAG_MEDIA_COUNT, DB_FIELD_TAG_MEDIA_COUNT, NULL}, - /* Bookmark */ - {MEDIA_BOOKMARK_ID, DB_FIELD_BOOKMARK_ID, NULL}, - {BOOKMARK_MARKED_TIME, DB_FIELD_BOOKMARK_MARKED_TIME, NULL}, - {BOOKMARK_NAME, DB_FIELD_BOOKMARK_NAME, NULL}, - /* Storage */ {MEDIA_STORAGE_ID, DB_FIELD_STORAGE_ID, NULL}, {MEDIA_STORAGE_PATH, DB_FIELD_STORAGE_PATH, NULL},