X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=include%2Fmedia_info_private.h;h=2580510ee94669fbc0d8c5c57fcc83891f472cc5;hb=52b3c233a5fa031b7e8f817fabafa664d7a3e0bd;hp=54fa7e38e65b224ab17fd80a0645232f808b0d82;hpb=50f4708675a5b38305e7a070501ee9afb15467de;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 54fa7e3..2580510 100755
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -376,9 +376,6 @@ typedef struct _media_content_cb_data {
 /* DB Table Alias */
 #define DB_TABLE_ALIAS_MEDIA			"m"
 #define DB_TABLE_ALIAS_FOLDER			"f"
-#define DB_TABLE_ALIAS_PLAYLIST			"p"
-#define DB_TABLE_ALIAS_PLAYLIST_MAP	"pm"
-#define DB_TABLE_ALIAS_TAG				"t"
 
 /* DB field for media */
 #define DB_FIELD_MEDIA_ID					"media_uuid"
@@ -448,19 +445,10 @@ 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"
 
-/* DB field for Face */
-#define DB_FIELD_FACE_ID				"face_id"
-#define DB_FIELD_FACE_TAG			"face_tag"
-
 /* DB Query Keyword */
 #define QUERY_KEYWORD_AND "AND"
 #define QUERY_KEYWORD_OR "OR"
@@ -511,9 +499,9 @@ typedef struct _media_content_cb_data {
 /* 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 * FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
-#define SELECT_TAG_FROM_TAG			"SELECT * FROM "DB_TABLE_TAG" WHERE tag_id=%d"
-#define SELECT_TAG_BY_NAME				"SELECT * FROM "DB_TABLE_TAG" WHERE name='%q'"
+#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'"
 
 /* Tag info*/
 #define INSERT_TAG_TO_TAG						"INSERT INTO "DB_TABLE_TAG" (name) VALUES (%Q)"
@@ -541,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'"
@@ -576,16 +564,16 @@ typedef struct _media_content_cb_data {
 #define SELECT_STORAGE_INFO_FROM_STORAGE	"SELECT storage_uuid, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_uuid='%s'"
 
 /* Face */
-#define DELETE_FACE_FROM_FACE			"DELETE FROM "DB_TABLE_FACE" WHERE face_id=%d"
-#define INSERT_FACE_TO_FACE				"INSERT INTO "DB_TABLE_FACE" (media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
-#define UPDATE_FACE_TO_FACE			"UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, face_tag=%Q WHERE face_id=%d"
+#define DELETE_FACE_FROM_FACE			"DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d"
+#define INSERT_FACE_TO_FACE				"INSERT INTO "DB_TABLE_FACE" (media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
+#define UPDATE_FACE_TO_FACE			"UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, media_face_tag=%Q WHERE media_face_id=%d"
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID		"SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND validity=1"
 #define SELECT_FACE_COUNT					"SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_COUNT_BY_MEDIA_ID		"SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_LIST					"SELECT face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, face_tag FROM "FACE_MEDIA_JOIN
-#define SELECT_FACE_LIST_BY_MEDIA_ID		"SELECT face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST	"UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_id=%d)"
-#define SELECT_FACE_ID			"SELECT face_id FROM "DB_TABLE_FACE" WHERE media_uuid='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND orientation=%d"
+#define SELECT_FACE_LIST					"SELECT media_face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, media_face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_MEDIA_ID		"SELECT media_face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
+#define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST	"UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_FACE" WHERE media_face_id=%d)"
+#define SELECT_FACE_ID			"SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_uuid='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND orientation=%d"
 
 int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condition_query, char *option_query);
 int _content_error_capi(int type, int cotent_error);