Match columns of tag with filter keyword

Change-Id: Ib9f753f8f3f377bbe9ca348955f5d2fe872cc608
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 2580510..4186189 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -440,11 +440,6 @@ typedef struct _media_content_cb_data {
 #define DB_FIELD_PLAYLIST_MEMBER_ORDER "play_order"
 #define DB_FIELD_PLAYLIST_MEDIA_COUNT                  "media_count"
 
-/* DB field for tag */
-#define DB_FIELD_TAG_ID                        "tag_id"
-#define DB_FIELD_TAG_NAME              "name"
-#define DB_FIELD_TAG_MEDIA_COUNT                       "media_count"
-
 /* DB field for Storage*/
 #define DB_FIELD_STORAGE_ID                    "storage_uuid"
 #define DB_FIELD_STORAGE_PATH          "storage_path"
@@ -472,7 +467,7 @@ typedef struct _media_content_cb_data {
 
 #define SELECT_FOLDER_LIST                     "SELECT DISTINCT f.folder_uuid, f.path, f.name, f.storage_type, f.storage_uuid FROM "FOLDER_MEDIA_JOIN
 #define SELECT_FOLDER_LIST_BY_STORAGE_ID       SELECT_FOLDER_LIST"AND f.storage_uuid='%s' "
-#define SELECT_TAG_LIST                                "SELECT DISTINCT tag_id, name FROM "DB_VIEW_TAG" WHERE 1 "
+#define SELECT_TAG_LIST                                "SELECT DISTINCT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE 1 "
 #define SELECT_PLAYLIST_LIST                   "SELECT DISTINCT playlist_id, name, p_thumbnail_path FROM "DB_VIEW_PLAYLIST" WHERE 1 "
 
 /* Get Group Count */
@@ -493,22 +488,22 @@ typedef struct _media_content_cb_data {
 #define SELECT_MEDIA_COUNT_FROM_GROUP_NULL             "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL    /* to apply limit condition. */
 #define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_uuid='%q'"
 #define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%q'"
-#define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND media_count>0) "
+#define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) "
 #define SELECT_MEDIA_COUNT_FROM_PLAYLIST                       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
 
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM                "SELECT * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
 #define SELECT_FOLDER_FROM_FOLDER              "SELECT folder_uuid, path, name, storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
 #define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define SELECT_TAG_FROM_TAG                    "SELECT name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
-#define SELECT_TAG_BY_NAME                             "SELECT tag_id FROM "DB_TABLE_TAG" WHERE name='%q'"
+#define SELECT_TAG_FROM_TAG                    "SELECT tag_name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
+#define SELECT_TAG_BY_NAME                             "SELECT tag_id FROM "DB_TABLE_TAG" WHERE tag_name='%q'"
 
 /* Tag info*/
-#define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (name) VALUES (%Q)"
+#define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (tag_name) VALUES (%Q)"
 #define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_uuid='%q';"
-#define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET name='%q' WHERE tag_id=%d;"
+#define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
 #define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
 
 /* Get Media list of Group */
 #define MEDIA_INFO_ITEM "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, thumbnail_path, description, \

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index 357a893..dc0d0e8 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -553,11 +553,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_PLAYLIST_MEMBER_ORDER "play_order"
 #define DB_FIELD_PLAYLIST_MEDIA_COUNT                  "media_count"
 
-/* DB field for tag */
-#define DB_FIELD_TAG_ID                        "tag_id"
-#define DB_FIELD_TAG_NAME              "name"
-#define DB_FIELD_TAG_MEDIA_COUNT                       "media_count"
-
 /* DB field for Storage*/
 #define DB_FIELD_STORAGE_ID                    "storage_uuid"
 #define DB_FIELD_STORAGE_PATH          "storage_path"
@@ -640,7 +635,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 #define SELECT_FOLDER_LIST                     "SELECT DISTINCT f.folder_uuid, f.path, f.name, f.storage_type, f.storage_uuid FROM "FOLDER_MEDIA_JOIN
 #define SELECT_FOLDER_LIST_BY_STORAGE_ID       SELECT_FOLDER_LIST"AND f.storage_uuid='%s' "
-#define SELECT_TAG_LIST                                "SELECT DISTINCT tag_id, name FROM "DB_VIEW_TAG" WHERE 1 "
+#define SELECT_TAG_LIST                                "SELECT DISTINCT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE 1 "
 #define SELECT_PLAYLIST_LIST                   "SELECT DISTINCT playlist_id, name, p_thumbnail_path FROM "DB_VIEW_PLAYLIST" WHERE 1 "
 
 /* Get Group Count */
@@ -661,22 +656,22 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_MEDIA_COUNT_FROM_GROUP_NULL             "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL    /* to apply limit condition. */
 #define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_uuid='%q'"
 #define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%q'"
-#define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND media_count>0) "
+#define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) "
 #define SELECT_MEDIA_COUNT_FROM_PLAYLIST                       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
 
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM                "SELECT * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
 #define SELECT_FOLDER_FROM_FOLDER              "SELECT folder_uuid, path, name, storage_type, storage_uuid FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
 #define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT name, thumbnail_path FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define SELECT_TAG_FROM_TAG                    "SELECT name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
-#define SELECT_TAG_BY_NAME                             "SELECT tag_id FROM "DB_TABLE_TAG" WHERE name='%q'"
+#define SELECT_TAG_FROM_TAG                    "SELECT tag_name FROM "DB_TABLE_TAG" WHERE tag_id=%d"
+#define SELECT_TAG_BY_NAME                             "SELECT tag_id FROM "DB_TABLE_TAG" WHERE tag_name='%q'"
 
 /* Tag info*/
-#define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (name) VALUES (%Q)"
+#define INSERT_TAG_TO_TAG                                              "INSERT INTO "DB_TABLE_TAG" (tag_name) VALUES (%Q)"
 #define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_uuid='%q';"
-#define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET name='%q' WHERE tag_id=%d;"
+#define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
 #define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
 
 /* Get Media list of Group */
 #ifdef _USE_SENIOR_MODE

diff --git a/src/media_content.c b/src/media_content.c
index 6e1a00c..2104d21 100755 (executable)
--- a/src/media_content.c
+++ b/src/media_content.c
@@ -102,13 +102,6 @@ static media_content_attribute_info_s g_content_attrs_info[] = {
        /* Playlist View */
        {PLAYLIST_MEDIA_COUNT,                  DB_FIELD_PLAYLIST_MEDIA_COUNT,                  NULL},
 
-       /* Tag */
-       {MEDIA_TAG_ID,                                  DB_FIELD_TAG_ID,                                                NULL},
-       {TAG_NAME,                                              DB_FIELD_TAG_NAME,                                              NULL},
-
-       /* Tag View */
-       {TAG_MEDIA_COUNT,                               DB_FIELD_TAG_MEDIA_COUNT,                               NULL},
-
        /* Storage */
        {MEDIA_STORAGE_ID,                              DB_FIELD_STORAGE_ID,                                    NULL},
        {MEDIA_STORAGE_PATH,                    DB_FIELD_STORAGE_PATH,                                  NULL},