Match columns of media with filter keyword 16/203716/4
authorMinje Ahn <minje.ahn@samsung.com>
Wed, 17 Apr 2019 06:38:54 +0000 (15:38 +0900)
committerMinje ahn <minje.ahn@samsung.com>
Mon, 22 Apr 2019 03:52:39 +0000 (03:52 +0000)
Change-Id: Id3ff4fd8f5cb0c13f0c8484f220128715e20e4d5
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>
include/media_info_private.h
include_product/media_info_private.h
src/media_content.c
src/media_db.c
src/media_filter.c
src/media_info.c
src/media_playlist.c
src/media_tag.c

index a1894d6..2c0c161 100755 (executable)
@@ -320,10 +320,6 @@ typedef struct {
        char *face_tag;                 /* face tag */
 } media_face_s;
 
-typedef struct _attribute_map_s {
-       GHashTable *attr_map;
-} attribute_s;
-
 typedef struct {
        media_info_s *handle;
        void *user_data;
@@ -346,9 +342,6 @@ typedef struct {
        void *user_data;
 } media_noti_cb_s;
 
-typedef struct attribute_s *attribute_h;
-
-
 typedef struct _media_content_cb_data {
        media_scan_completed_cb callback;
        void *user_data;
@@ -374,44 +367,27 @@ typedef struct _media_content_cb_data {
 #define DB_VIEW_MEDIA          "media_view"
 
 /* DB field for media */
-#define DB_FIELD_MEDIA_ID                                      "media_uuid"
-#define DB_FIELD_MEDIA_PATH                            "path"
-#define DB_FIELD_MEDIA_DISPLAY_NAME            "file_name"
-#define DB_FIELD_MEDIA_TYPE                                    "media_type"
-#define DB_FIELD_MEDIA_MIME_TYPE                       "mime_type"
-#define DB_FIELD_MEDIA_SIZE                                    "size"
-#define DB_FIELD_MEDIA_ADDED_TIME                      "added_time"
-#define DB_FIELD_MEDIA_MODIFIED_TIME           "modified_time"
-#define DB_FIELD_MEDIA_TIMELINE                                "timeline"
-#define DB_FIELD_MEDIA_THUMBNAIL_PATH  "thumbnail_path"
-#define DB_FIELD_MEDIA_TITLE                           "title"
-#define DB_FIELD_MEDIA_ALBUM                           "album"
-#define DB_FIELD_MEDIA_ARTIST                          "artist"
-#define DB_FIELD_MEDIA_ALBUM_ARTIST                    "album_artist"
-#define DB_FIELD_MEDIA_GENRE                           "genre"
-#define DB_FIELD_MEDIA_COMPOSER                        "composer"
-#define DB_FIELD_MEDIA_YEAR                            "year"
-#define DB_FIELD_MEDIA_RECORDED_DATE           "recorded_date"
-#define DB_FIELD_MEDIA_COPYRIGHT                       "copyright"
-#define DB_FIELD_MEDIA_TRACK_NUM                       "track_num"
-#define DB_FIELD_MEDIA_DESCRIPTION                     "description"
-#define DB_FIELD_MEDIA_BITRATE                         "bitrate"
-#define DB_FIELD_MEDIA_BITPERSAMPLE            "bitpersample"
-#define DB_FIELD_MEDIA_SAMPLERATE                      "samplerate"
-#define DB_FIELD_MEDIA_CHANNEL                 "channel"
-#define DB_FIELD_MEDIA_DURATION                        "duration"
-#define DB_FIELD_MEDIA_LONGITUDE                       "longitude"
-#define DB_FIELD_MEDIA_LATITUDE                        "latitude"
-#define DB_FIELD_MEDIA_ALTITUDE                        "altitude"
-#define DB_FIELD_MEDIA_WIDTH                           "width"
-#define DB_FIELD_MEDIA_HEIGHT                          "height"
-#define DB_FIELD_MEDIA_DATETAKEN                       "datetaken"
-#define DB_FIELD_MEDIA_ORIENTATION             "orientation"
-#define DB_FIELD_MEDIA_RATING                          "rating"
-#define DB_FIELD_MEDIA_FAVOURITE                       "favourite"
-#define DB_FIELD_MEDIA_IS_DRM                          "is_drm"
-#define DB_FIELD_MEDIA_STORAGE_TYPE            "storage_type"
-#define DB_FIELD_MEDIA_360                                                     "is_360"
+#define DB_FIELD_MEDIA_DISPLAY_NAME            "media_display_name"
+#define DB_FIELD_MEDIA_TYPE                            "media_type"
+#define DB_FIELD_MEDIA_MIME_TYPE               "media_mime_type"
+#define DB_FIELD_MEDIA_SIZE                            "media_size"
+#define DB_FIELD_MEDIA_ADDED_TIME              "media_added_time"
+#define DB_FIELD_MEDIA_MODIFIED_TIME   "media_modified_time"
+#define DB_FIELD_MEDIA_TITLE                   "media_title"
+#define DB_FIELD_MEDIA_ALBUM                   "media_album"
+#define DB_FIELD_MEDIA_ARTIST                  "media_artist"
+#define DB_FIELD_MEDIA_ALBUM_ARTIST            "media_album_artist"
+#define DB_FIELD_MEDIA_GENRE                   "media_genre"
+#define DB_FIELD_MEDIA_COMPOSER                        "media_composer"
+#define DB_FIELD_MEDIA_YEAR                            "media_year"
+#define DB_FIELD_MEDIA_RECORDED_DATE   "media_recorded_date"
+#define DB_FIELD_MEDIA_COPYRIGHT               "media_copyright"
+#define DB_FIELD_MEDIA_TRACK_NUM               "media_track_num"
+#define DB_FIELD_MEDIA_DESCRIPTION             "media_description"
+#define DB_FIELD_MEDIA_RATING                  "media_rating"
+#define DB_FIELD_MEDIA_LONGITUDE               "media_longitude"
+#define DB_FIELD_MEDIA_LATITUDE                "media_latitude"
+#define DB_FIELD_MEDIA_ALTITUDE                "media_altitude"
 
 /* DB Query Keyword */
 #define QUERY_KEYWORD_AND "AND"
@@ -422,7 +398,7 @@ typedef struct _media_content_cb_data {
 #define QUERY_KEYWORD_SPACE " "
 #define QUERY_KEYWORD_OPEN_BRACKET "("
 #define QUERY_KEYWORD_BRACKET ")"
-#define QUERY_KEYWORD_COLLATE "COLLATE "
+#define QUERY_KEYWORD_COLLATE " COLLATE "
 
 /* DB TABLE JOIN */
 #define FOLDER_MEDIA_JOIN              DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN '%s' WHERE validity=1 "
@@ -469,17 +445,17 @@ typedef struct _media_content_cb_data {
 
 /* Tag info*/
 #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 REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
 #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, tag_name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
+#define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%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, \
-                                                       rating, favourite, is_drm, storage_type, longitude, latitude, altitude, exposure_time, fnumber, iso, \
-                                                       model, width, height, datetaken, orientation, title, album, artist, album_artist, genre, \
-                                                       composer, year, recorded_date, copyright, track_num, bitrate, bitpersample, duration, samplerate, channel, \
-                                                       timeline, sync_status, storage_uuid, is_360"
+#define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
+                                                       media_rating, media_favourite, media_is_drm, media_storage_type, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
+                                                       model, media_width, media_height, media_datetaken, media_orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+                                                       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
+                                                       media_timeline, sync_status, storage_uuid, media_360"
 
 /* Playlist Info */
 #define INSERT_PLAYLIST_TO_PLAYLIST                                            "INSERT INTO "DB_TABLE_PLAYLIST" (playlist_name) VALUES (%Q)"
@@ -491,32 +467,32 @@ typedef struct _media_content_cb_data {
 #define SELECT_MAX_PLAY_ORDER_FROM_PLAYLIST_VIEW       "SELECT MAX(playlist_member_order) FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d"
 #define REMOVE_PLAYLIST_ITEM_FROM_PLAYLIST_MAP         "DELETE FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d AND _id=%d;"
 #define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP                "UPDATE "DB_TABLE_PLAYLIST_MAP" SET playlist_member_order=%d WHERE playlist_id=%d AND _id=%d;"
-#define INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP           "INSERT INTO "DB_TABLE_PLAYLIST_MAP" (playlist_id, media_uuid, playlist_member_order) VALUES (%d, '%q', %d);"
+#define INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP           "INSERT INTO "DB_TABLE_PLAYLIST_MAP" (playlist_id, media_id, playlist_member_order) VALUES (%d, '%q', %d);"
 
 /* Bookmark */
-#define INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
-#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_uuid='%s'"
-#define SELECT_BOOKMARK_LIST                                           "SELECT bookmark_id, media_uuid, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
-#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT bookmark_id, media_uuid, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND 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 INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
+#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_BOOKMARK_LIST                                           "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
+#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_id='%s' AND bookmark_marked_time=%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'"
+#define UPDATE_IMAGE_META_FROM_MEDIA   "UPDATE '%s' SET media_orientation=%d WHERE media_id='%q'"
 
 #define SELECT_MEDIA_ITEM                                      "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1"
-#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_uuid='%s'"
-#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND path='%q'"
+#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_id='%s'"
+#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_path='%q'"
 #define SELECT_MEDIA_FROM_ALBUM                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND album_id=%d"
 #define SELECT_MEDIA_FROM_GROUP                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s='%q'"
 #define SELECT_MEDIA_FROM_GROUP_NULL   "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s IS NULL"
 #define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND folder_id='%s'"
 #define SELECT_MEDIA_FROM_STORAGE              "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND storage_uuid='%s'"
-#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
-#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
-#define SELECT_MEDIA_PATH_BY_ID                        "SELECT path FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q'"
-#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q'"
+#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
+#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
+#define SELECT_MEDIA_PATH_BY_ID                        "SELECT media_path FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
+#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
 
 /* Delete */
 #define DELETE_PLAYLIST_FROM_PLAYLIST          "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
@@ -530,23 +506,22 @@ typedef struct _media_content_cb_data {
 
 /* Face */
 #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, face_orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
+#define INSERT_FACE_TO_FACE                            "INSERT INTO "DB_TABLE_FACE" (media_id, face_rect_x , face_rect_y, face_rect_w, face_rect_h, face_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, face_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_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND media_type=0 AND validity=1"
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND validity=1"
+#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND media_type=0 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 media_uuid='%s'"
-#define SELECT_FACE_LIST                                       "SELECT media_face_id, media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
-#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT media_face_id, media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND 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 face_orientation=%d"
+#define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_FACE_LIST                                       "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
+#define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_id IN (SELECT media_id FROM "DB_TABLE_FACE" WHERE media_face_id=%d)"
+#define SELECT_FACE_ID                 "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_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);
 int _content_query_sql(char *query_str);
 sqlite3 * _content_get_db_handle(void);
 uid_t _content_get_uid(void);
-attribute_h _content_get_attirbute_handle(void);
 int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media);
 void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media);
 int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *group_count);
@@ -568,12 +543,9 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
 int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user_data);
 int _media_db_get_storage_id_by_media_id(const char *media_id, char *storage_id);
 
-int _media_filter_attribute_create(attribute_h *attr);
-int _media_filter_attribute_add(attribute_h atrr, const char *user_attr, const char *platform_attr);
-int _media_filter_attribute_destory(attribute_h attr);
-int _media_filter_attribute_generate(attribute_h attr, filter_h filter, char **generated_condition);
-int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, char **generated_option);
-int _media_filter_attribute_option_generate_with_full_query(attribute_h attr, filter_h filter, char **generated_option);
+int _media_filter_attribute_generate(filter_h filter, char **generated_condition);
+int _media_filter_attribute_option_generate(filter_h filter, char **generated_option);
+int _media_filter_attribute_option_generate_with_full_query(filter_h filter, char **generated_option);
 
 
 #define FONT_COLOR_RESET    "\033[0m"
index 9dfaa81..f1b1fb3 100755 (executable)
@@ -416,10 +416,6 @@ typedef struct {
        int played_count;
 } media_uhd_s;
 
-typedef struct _attribute_map_s {
-       GHashTable *attr_map;
-} attribute_s;
-
 typedef struct {
        media_info_s *handle;
        void *user_data;
@@ -442,9 +438,6 @@ typedef struct {
        void *user_data;
 } media_noti_cb_s;
 
-typedef struct attribute_s *attribute_h;
-
-
 typedef struct _media_content_cb_data {
        media_scan_completed_cb callback;
        void *user_data;
@@ -476,49 +469,33 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_VIEW_MEDIA          "media_view"
 
 /* DB field for media */
-#define DB_FIELD_MEDIA_ID                                      "media_uuid"
-#define DB_FIELD_MEDIA_PATH                            "path"
-#define DB_FIELD_MEDIA_DISPLAY_NAME            "file_name"
+#define DB_FIELD_MEDIA_DISPLAY_NAME            "media_display_name"
 #define DB_FIELD_MEDIA_TYPE                                    "media_type"
-#define DB_FIELD_MEDIA_MIME_TYPE                       "mime_type"
-#define DB_FIELD_MEDIA_SIZE                                    "size"
-#define DB_FIELD_MEDIA_ADDED_TIME                      "added_time"
-#define DB_FIELD_MEDIA_MODIFIED_TIME           "modified_time"
-#define DB_FIELD_MEDIA_TIMELINE                                "timeline"
-#define DB_FIELD_MEDIA_THUMBNAIL_PATH  "thumbnail_path"
-#define DB_FIELD_MEDIA_TITLE                           "title"
-#define DB_FIELD_MEDIA_ALBUM                           "album"
-#define DB_FIELD_MEDIA_ARTIST                          "artist"
-#define DB_FIELD_MEDIA_ALBUM_ARTIST                    "album_artist"
-#define DB_FIELD_MEDIA_GENRE                           "genre"
-#define DB_FIELD_MEDIA_COMPOSER                        "composer"
-#define DB_FIELD_MEDIA_YEAR                            "year"
-#define DB_FIELD_MEDIA_RECORDED_DATE           "recorded_date"
-#define DB_FIELD_MEDIA_COPYRIGHT                       "copyright"
-#define DB_FIELD_MEDIA_TRACK_NUM                       "track_num"
-#define DB_FIELD_MEDIA_DESCRIPTION                     "description"
-#define DB_FIELD_MEDIA_BITRATE                         "bitrate"
-#define DB_FIELD_MEDIA_BITPERSAMPLE            "bitpersample"
-#define DB_FIELD_MEDIA_SAMPLERATE                      "samplerate"
-#define DB_FIELD_MEDIA_CHANNEL                 "channel"
-#define DB_FIELD_MEDIA_DURATION                        "duration"
-#define DB_FIELD_MEDIA_LONGITUDE                       "longitude"
-#define DB_FIELD_MEDIA_LATITUDE                        "latitude"
-#define DB_FIELD_MEDIA_ALTITUDE                        "altitude"
-#define DB_FIELD_MEDIA_WIDTH                           "width"
-#define DB_FIELD_MEDIA_HEIGHT                          "height"
-#define DB_FIELD_MEDIA_DATETAKEN                       "datetaken"
-#define DB_FIELD_MEDIA_ORIENTATION             "orientation"
+#define DB_FIELD_MEDIA_MIME_TYPE               "media_mime_type"
+#define DB_FIELD_MEDIA_SIZE                            "media_size"
+#define DB_FIELD_MEDIA_ADDED_TIME              "media_added_time"
+#define DB_FIELD_MEDIA_MODIFIED_TIME   "media_modified_time"
+#define DB_FIELD_MEDIA_TITLE                   "media_title"
+#define DB_FIELD_MEDIA_ALBUM                   "media_album"
+#define DB_FIELD_MEDIA_ARTIST                  "media_artist"
+#define DB_FIELD_MEDIA_ALBUM_ARTIST            "media_album_artist"
+#define DB_FIELD_MEDIA_GENRE                   "media_genre"
+#define DB_FIELD_MEDIA_COMPOSER                        "media_composer"
+#define DB_FIELD_MEDIA_YEAR                            "media_year"
+#define DB_FIELD_MEDIA_RECORDED_DATE   "media_recorded_date"
+#define DB_FIELD_MEDIA_COPYRIGHT               "media_copyright"
+#define DB_FIELD_MEDIA_TRACK_NUM               "media_track_num"
+#define DB_FIELD_MEDIA_DESCRIPTION             "media_description"
+#define DB_FIELD_MEDIA_RATING                  "media_rating"
+#define DB_FIELD_MEDIA_LONGITUDE               "media_longitude"
+#define DB_FIELD_MEDIA_LATITUDE                "media_latitude"
+#define DB_FIELD_MEDIA_ALTITUDE                "media_altitude"
+
 #define DB_FIELD_MEDIA_PLAYED_COUNT            "played_count"
 #define DB_FIELD_MEDIA_LAST_PLAYED_TIME                "last_played_time"
 #define DB_FIELD_MEDIA_LAST_PLAYED_POSITION    "last_played_position"
-#define DB_FIELD_MEDIA_RATING                          "rating"
-#define DB_FIELD_MEDIA_FAVOURITE                       "favourite"
-#define DB_FIELD_MEDIA_IS_DRM                          "is_drm"
-#define DB_FIELD_MEDIA_STORAGE_TYPE            "storage_type"
 #define DB_FIELD_MEDIA_MODIFIED_MONTH  "modified_month"
 #define DB_FIELD_MEDIA_MODIFIED_DATE   "modified_date"
-#define DB_FIELD_MEDIA_360                                                     "is_360"
 #define DB_FIELD_MEDIA_STITCHED_INFO                           "stitched_info"
 #ifdef _USE_SENIOR_MODE
 #define DB_FIELD_MEDIA_CONTACT                 "contact"
@@ -586,7 +563,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define QUERY_KEYWORD_SPACE " "
 #define QUERY_KEYWORD_OPEN_BRACKET "("
 #define QUERY_KEYWORD_BRACKET ")"
-#define QUERY_KEYWORD_COLLATE "COLLATE "
+#define QUERY_KEYWORD_COLLATE " COLLATE "
 
 /* DB TABLE JOIN */
 #define FOLDER_MEDIA_JOIN              DB_TABLE_FOLDER" NATURAL LEFT OUTER JOIN '%s' WHERE validity=1 "
@@ -636,25 +613,25 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Tag info*/
 #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 REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
 #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, tag_name FROM "DB_VIEW_TAG" WHERE media_uuid = '%s'"
+#define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
 
 /* Get Media list of Group */
 #ifdef _USE_SENIOR_MODE
-#define MEDIA_INFO_ITEM "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, thumbnail_path, description, \
-                                                       rating, favourite, is_drm, storage_type, longitude, latitude, altitude, exposure_time, fnumber, iso, \
-                                                       model, width, height, datetaken, orientation, title, album, artist, album_artist, genre, \
-                                                       composer, year, recorded_date, copyright, track_num, bitrate, bitpersample, duration, samplerate, channel, \
-                                                       timeline, sync_status, storage_uuid, is_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date, contact, \
+#define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
+                                                       media_rating, media_favourite, media_is_drm, media_storage_type, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
+                                                       model, media_width, media_height, media_datetaken, media_orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+                                                       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
+                                                       media_timeline, sync_status, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date, contact, \
                                                        app_data"
 #else
-#define MEDIA_INFO_ITEM "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, thumbnail_path, description, \
-                                                       rating, favourite, is_drm, storage_type, longitude, latitude, altitude, exposure_time, fnumber, iso, \
-                                                       model, width, height, datetaken, orientation, title, album, artist, album_artist, genre, \
-                                                       composer, year, recorded_date, copyright, track_num, bitrate, bitpersample, duration, samplerate, channel, \
-                                                       timeline, sync_status, storage_uuid, is_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
+#define MEDIA_INFO_ITEM "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, media_thumbnail_path, media_description, \
+                                                       media_rating, media_favourite, media_is_drm, media_storage_type, media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, \
+                                                       model, media_width, media_height, media_datetaken, media_orientation, media_title, media_album, media_artist, media_album_artist, media_genre, \
+                                                       media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_bitrate, media_bitpersample, media_duration, media_samplerate, media_channel, \
+                                                       media_timeline, sync_status, storage_uuid, media_360, played_count, last_played_time, last_played_position, stitched_info, extract_flag, modified_date"
 #endif
 
 /* Playlist Info */
@@ -667,32 +644,32 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_MAX_PLAY_ORDER_FROM_PLAYLIST_VIEW       "SELECT MAX(playlist_member_order) FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d"
 #define REMOVE_PLAYLIST_ITEM_FROM_PLAYLIST_MAP         "DELETE FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d AND _id=%d;"
 #define UPDATE_PLAYLIST_ORDER_FROM_PLAYLIST_MAP                "UPDATE "DB_TABLE_PLAYLIST_MAP" SET playlist_member_order=%d WHERE playlist_id=%d AND _id=%d;"
-#define INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP           "INSERT INTO "DB_TABLE_PLAYLIST_MAP" (playlist_id, media_uuid, playlist_member_order) VALUES (%d, '%q', %d);"
+#define INSERT_PLAYLIST_ITEM_TO_PLAYLIST_MAP           "INSERT INTO "DB_TABLE_PLAYLIST_MAP" (playlist_id, media_id, playlist_member_order) VALUES (%d, '%q', %d);"
 
 /* Bookmark */
-#define INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_uuid, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
-#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_uuid='%s'"
-#define SELECT_BOOKMARK_LIST                                           "SELECT bookmark_id, media_uuid, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
-#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT bookmark_id, media_uuid, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND 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 INSERT_BOOKMARK_TO_BOOKMARK                    "INSERT INTO "DB_TABLE_BOOKMARK" (media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name) VALUES ('%q', '%d', %Q, %Q)"
+#define SELECT_BOOKMARK_COUNT_BY_MEDIA_ID              "SELECT COUNT(*) FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_BOOKMARK_LIST                                           "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN
+#define SELECT_BOOKMARK_LIST_BY_MEDIA_ID                       "SELECT bookmark_id, media_id, bookmark_marked_time, bookmark_thumbnail_path, bookmark_name FROM "BOOKMARK_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_BOOKMARK_ID_FROM_BOOKMARK               "SELECT bookmark_id FROM "DB_TABLE_BOOKMARK" WHERE media_id='%s' AND bookmark_marked_time=%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'"
+#define UPDATE_IMAGE_META_FROM_MEDIA   "UPDATE '%s' SET media_orientation=%d WHERE media_id='%q'"
 
 #define SELECT_MEDIA_ITEM                                      "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1"
-#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_uuid='%s'"
-#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND path='%q'"
+#define SELECT_MEDIA_FROM_MEDIA                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_id='%s'"
+#define SELECT_MEDIA_BY_PATH                           "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND media_path='%q'"
 #define SELECT_MEDIA_FROM_ALBUM                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND album_id=%d"
 #define SELECT_MEDIA_FROM_GROUP                        "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s='%q'"
 #define SELECT_MEDIA_FROM_GROUP_NULL   "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND %s IS NULL"
 #define SELECT_MEDIA_FROM_FOLDER                       "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND folder_id='%s'"
 #define SELECT_MEDIA_FROM_STORAGE              "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE validity=1 AND storage_uuid='%s'"
-#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
-#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
-#define SELECT_MEDIA_PATH_BY_ID                        "SELECT path FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q'"
-#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q'"
+#define SELECT_MEDIA_FROM_TAG                          "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d) AND validity=1"
+#define SELECT_MEDIA_FROM_PLAYLIST             "SELECT "MEDIA_INFO_ITEM" FROM '%s' WHERE media_id IN (SELECT media_id FROM "DB_TABLE_PLAYLIST_MAP" WHERE playlist_id=%d) AND validity=1"
+#define SELECT_MEDIA_PATH_BY_ID                        "SELECT media_path FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
+#define SELECT_MEDIA_STORAGE_ID_BY_ID          "SELECT storage_uuid FROM "DB_VIEW_MEDIA" WHERE media_id='%q'"
 
 /* Delete */
 #define DELETE_PLAYLIST_FROM_PLAYLIST          "DELETE FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
@@ -706,24 +683,24 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Face */
 #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, face_orientation, media_face_tag) VALUES ('%q', %d, %d, %d, %d, %d, %Q);"
+#define INSERT_FACE_TO_FACE                            "INSERT INTO "DB_TABLE_FACE" (media_id, face_rect_x , face_rect_y, face_rect_w, face_rect_h, face_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, face_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_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND media_type=0 AND validity=1"
+#define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND validity=1"
+#define SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_id='%q' AND media_type=0 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 media_uuid='%s'"
-#define SELECT_FACE_LIST                                       "SELECT media_face_id, media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
-#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT media_face_id, media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND 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 face_orientation=%d"
+#define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
+#define SELECT_FACE_LIST                                       "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT media_face_id, media_id, face_rect_x, face_rect_y, face_rect_w, face_rect_h, face_orientation, media_face_tag FROM "FACE_MEDIA_JOIN" AND media_id='%s'"
+#define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_id IN (SELECT media_id FROM "DB_TABLE_FACE" WHERE media_face_id=%d)"
+#define SELECT_FACE_ID                 "SELECT media_face_id FROM "DB_TABLE_FACE" WHERE media_id='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND face_orientation=%d"
 
 #define SELECT_VALID_STORAGE_FROM_PVR  "WHERE storage_id IN (SELECT storage_id FROM "DB_TABLE_STORAGE" WHERE validity=1)"
 #define SELECT_PVR_COUNT                                       "SELECT COUNT(*) FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 #define SELECT_PVR_LIST                                        "SELECT * FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 #define SELECT_PVR_COUNT_BY_STORAGE_ID SELECT_PVR_COUNT" AND storage_uuid='%s'"
 #define SELECT_PVR_LIST_BY_STORAGE_ID          SELECT_PVR_LIST" AND storage_uuid='%s'"
-#define SELECT_PVR_FROM_PVR                            "SELECT * FROM "DB_TABLE_PVR" WHERE media_uuid='%q'"
-#define UPDATE_PVR_META_FROM_PVR               "UPDATE "DB_TABLE_PVR" SET program_title=%Q, content_lock=%d, content_watch=%d, play_count=%d, highlight=%d WHERE media_uuid='%q'"
+#define SELECT_PVR_FROM_PVR                            "SELECT * FROM "DB_TABLE_PVR" WHERE media_id='%q'"
+#define UPDATE_PVR_META_FROM_PVR               "UPDATE "DB_TABLE_PVR" SET program_title=%Q, content_lock=%d, content_watch=%d, play_count=%d, highlight=%d WHERE media_id='%q'"
 #define UPDATE_PVR_LOCAL_RECORD_PVR            "UPDATE "DB_TABLE_PVR" SET is_local_record=%d WHERE path='%q' AND storage_uuid='%q'"
 
 #define SELECT_PVR_GROUP_LIST                                          "SELECT DISTINCT %s FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
@@ -761,15 +738,14 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_UHD_COUNT_BY_STORAGE_ID SELECT_UHD_COUNT" AND storage_uuid='%s'"
 #define SELECT_UHD_LIST                                        "SELECT * FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
 #define SELECT_UHD_LIST_BY_STORAGE_ID  SELECT_UHD_LIST" AND storage_uuid='%s'"
-#define SELECT_UHD_FROM_UHD                            "SELECT * FROM "DB_TABLE_UHD" WHERE media_uuid='%q'"
-#define UPDATE_UHD_META_FROM_UHD               "UPDATE "DB_TABLE_UHD" SET content_title=%Q, release_date=%Q, played_position=%d, sub_type=%d, played_count=%d WHERE media_uuid='%q'"
+#define SELECT_UHD_FROM_UHD                            "SELECT * FROM "DB_TABLE_UHD" WHERE media_id='%q'"
+#define UPDATE_UHD_META_FROM_UHD               "UPDATE "DB_TABLE_UHD" SET content_title=%Q, release_date=%Q, played_position=%d, sub_type=%d, played_count=%d WHERE media_id='%q'"
 
 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);
 int _content_query_sql(char *query_str);
 sqlite3 * _content_get_db_handle(void);
 uid_t _content_get_uid(void);
-attribute_h _content_get_attirbute_handle(void);
 int _media_info_get_media_info_from_db(const char *path, const char *storage_id, media_info_h media);
 void _media_info_item_get_detail(sqlite3_stmt *stmt, media_info_h media);
 int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *group_count);
@@ -803,12 +779,9 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_
 int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data);
 void _media_uhd_item_get_detail(sqlite3_stmt* stmt, media_uhd_h uhd);
 
-int _media_filter_attribute_create(attribute_h *attr);
-int _media_filter_attribute_add(attribute_h atrr, const char *user_attr, const char *platform_attr);
-int _media_filter_attribute_destory(attribute_h attr);
-int _media_filter_attribute_generate(attribute_h attr, filter_h filter, char **generated_condition);
-int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, char **generated_option);
-int _media_filter_attribute_option_generate_with_full_query(attribute_h attr, filter_h filter, char **generated_option);
+int _media_filter_attribute_generate(filter_h filter, char **generated_condition);
+int _media_filter_attribute_option_generate(filter_h filter, char **generated_option);
+int _media_filter_attribute_option_generate_with_full_query(filter_h filter, char **generated_option);
 
 GMutex* _content_get_db_mutex(void);
 
index 5b138e7..a3818ec 100755 (executable)
 #include <media_info_private.h>
 #include <media_util_private.h>
 
-static attribute_h g_attr_handle = NULL;
 static sqlite3 *db_handle = NULL;
 static int ref_count = 0;
 static GMutex db_mutex;
 static uid_t content_g_uid = 0;
 
-typedef struct {
-       char *user_attr;
-       char *platform_attr;
-} media_content_attribute_info_s;
-
-static int __media_content_destroy_attribute_handle(void);
-
-static media_content_attribute_info_s g_content_attrs_info[] = {
-       /* Media Info */
-       {MEDIA_ID,                                              DB_FIELD_MEDIA_ID},
-       {MEDIA_PATH,                                    DB_FIELD_MEDIA_PATH},
-       {MEDIA_DISPLAY_NAME,                    DB_FIELD_MEDIA_DISPLAY_NAME},
-       {MEDIA_MIME_TYPE,                               DB_FIELD_MEDIA_MIME_TYPE},
-       {MEDIA_SIZE,                                            DB_FIELD_MEDIA_SIZE},
-       {MEDIA_ADDED_TIME,                              DB_FIELD_MEDIA_ADDED_TIME},
-       {MEDIA_MODIFIED_TIME,                   DB_FIELD_MEDIA_MODIFIED_TIME},
-       {MEDIA_TIMELINE,                                        DB_FIELD_MEDIA_TIMELINE},
-       {MEDIA_THUMBNAIL_PATH,                  DB_FIELD_MEDIA_THUMBNAIL_PATH},
-       {MEDIA_TITLE,                                   DB_FIELD_MEDIA_TITLE},
-       {MEDIA_ALBUM,                                   DB_FIELD_MEDIA_ALBUM},
-       {MEDIA_ARTIST,                                  DB_FIELD_MEDIA_ARTIST},
-       {MEDIA_ALBUM_ARTIST,                    DB_FIELD_MEDIA_ALBUM_ARTIST},
-       {MEDIA_GENRE,                                   DB_FIELD_MEDIA_GENRE},
-       {MEDIA_COMPOSER,                                DB_FIELD_MEDIA_COMPOSER},
-       {MEDIA_YEAR,                                    DB_FIELD_MEDIA_YEAR},
-       {MEDIA_RECORDED_DATE,                   DB_FIELD_MEDIA_RECORDED_DATE},
-       {MEDIA_COPYRIGHT,                               DB_FIELD_MEDIA_COPYRIGHT},
-       {MEDIA_TRACK_NUM,                               DB_FIELD_MEDIA_TRACK_NUM},
-       {MEDIA_DESCRIPTION,                             DB_FIELD_MEDIA_DESCRIPTION},
-       {MEDIA_BITRATE,                                 DB_FIELD_MEDIA_BITRATE},
-       {MEDIA_BITPERSAMPLE,                    DB_FIELD_MEDIA_BITPERSAMPLE},
-       {MEDIA_SAMPLERATE,                              DB_FIELD_MEDIA_SAMPLERATE},
-       {MEDIA_CHANNEL,                         DB_FIELD_MEDIA_CHANNEL},
-       {MEDIA_DURATION,                                DB_FIELD_MEDIA_DURATION},
-       {MEDIA_LONGITUDE,                               DB_FIELD_MEDIA_LONGITUDE},
-       {MEDIA_LATITUDE,                                DB_FIELD_MEDIA_LATITUDE},
-       {MEDIA_ALTITUDE,                                DB_FIELD_MEDIA_ALTITUDE},
-       {MEDIA_WIDTH,                                   DB_FIELD_MEDIA_WIDTH},
-       {MEDIA_HEIGHT,                                  DB_FIELD_MEDIA_HEIGHT},
-       {MEDIA_DATETAKEN,                               DB_FIELD_MEDIA_DATETAKEN},
-       {MEDIA_ORIENTATION,                     DB_FIELD_MEDIA_ORIENTATION},
-       {MEDIA_RATING,                                  DB_FIELD_MEDIA_RATING},
-       {MEDIA_FAVOURITE,                               DB_FIELD_MEDIA_FAVOURITE},
-       {MEDIA_IS_DRM,                                  DB_FIELD_MEDIA_IS_DRM},
-       {MEDIA_STORAGE_TYPE,                    DB_FIELD_MEDIA_STORAGE_TYPE},
-       {MEDIA_360,                                             DB_FIELD_MEDIA_360},
-
-#ifdef _USE_SENIOR_MODE
-       {MEDIA_CONTACT,                         DB_FIELD_MEDIA_CONTACT},
-       {MEDIA_APP_DATA,                                DB_FIELD_MEDIA_APP_DATA},
-#endif
-#ifdef _USE_TVPD_MODE
-       {MEDIA_PLAYED_COUNT,                    DB_FIELD_MEDIA_PLAYED_COUNT},
-       {MEDIA_LAST_PLAYED_TIME,                DB_FIELD_MEDIA_LAST_PLAYED_TIME},
-       {MEDIA_LAST_PLAYED_POSITION,    DB_FIELD_MEDIA_LAST_PLAYED_POSITION},
-       {MEDIA_FOLDER_ID,                               DB_FIELD_MEDIA_FOLDER_ID},
-       {MEDIA_STITCHED_INFO,                   DB_FIELD_MEDIA_STITCHED_INFO},
-       {MEDIA_MODIFIED_MONTH,          DB_FIELD_MEDIA_MODIFIED_MONTH},
-       {MEDIA_MODIFIED_DATE,                   DB_FIELD_MEDIA_MODIFIED_DATE},
-
-       /* PVR */
-       {PVR_DURATION,                                  DB_FIELD_PVR_DURATION},
-       {PVR_TIME_ZONE,                                 DB_FIELD_PVR_TIME_ZONE},
-       {PVR_PTC,                                               DB_FIELD_PVR_PTC},
-       {PVR_MAJOR,                                             DB_FIELD_PVR_MAJOR},
-       {PVR_MINOR,                                             DB_FIELD_PVR_MINOR},
-       {PVR_CHANNEL_TYPE,                              DB_FIELD_PVR_CHANNEL_TYPE},
-       {PVR_CHANNEL_NAME,                              DB_FIELD_PVR_CHANNEL_NAME},
-       {PVR_CHANNEL_NUM,                               DB_FIELD_PVR_CHANNEL_NUM},
-       {PVR_PROGRAM_TITLE,                             DB_FIELD_PVR_PROGRAM_TITLE},
-       {PVR_PROGRAM_NUM,                               DB_FIELD_PVR_PROGRAM_NUM},
-       {PVR_PROGRAM_CRID,                              DB_FIELD_PVR_PROGRAM_CRID},
-       {PVR_GUIDANCE,                                  DB_FIELD_PVR_GUIDANCE},
-       {PVR_SYNOPSIS,                                  DB_FIELD_PVR_SYNOPSIS},
-       {PVR_GENRE,                                             DB_FIELD_PVR_GENRE},
-       {PVR_LANGUAGE,                                  DB_FIELD_PVR_LANGUAGE},
-       {PVR_EMBARGO_TIME,                              DB_FIELD_PVR_EMBARGO_TIME},
-       {PVR_EXPIRY_TIME,                               DB_FIELD_PVR_EXPIRY_TIME},
-       {PVR_START_TIME,                                        DB_FIELD_PVR_START_TIME},
-       {PVR_PROGRAM_START_TIME,                DB_FIELD_PVR_PROGRAM_START_TIME},
-       {PVR_PROGRAM_END_TIME,                  DB_FIELD_PVR_PROGRAM_END_TIME},
-       {PVR_PROGRAM_DATE,                              DB_FIELD_PVR_PROGRAM_DATE},
-       {PVR_PARENTAL_RATING,                   DB_FIELD_PVR_PARENTAL_RATING},
-       {PVR_TIMER_RECORD,                              DB_FIELD_PVR_TIMER_RECORD},
-       {PVR_SERIES_RECORD,                             DB_FIELD_PVR_SERIES_RECORD},
-       {PVR_HD,                                                        DB_FIELD_PVR_HD},
-       {PVR_SUBTITLE,                                  DB_FIELD_PVR_SUBTITLE},
-       {PVR_TTX,                                               DB_FIELD_PVR_TTX},
-       {PVR_AD,                                                        DB_FIELD_PVR_AD},
-       {PVR_TTX,                                               DB_FIELD_PVR_TTX},
-       {PVR_DATA_SERVICE,                              DB_FIELD_PVR_DATA_SERVICE},
-       {PVR_CONTENT_LOCK,                              DB_FIELD_PVR_CONTENT_LOCK},
-       {PVR_CONTENT_WATCH,                     DB_FIELD_PVR_CONTENT_WATCH},
-       {PVR_CONTENT_HAS_AUDIO_ONLY,    DB_FIELD_PVR_HAS_AUDIO_ONLY},
-       {PVR_CONTENT_IS_LOCAL_RECORD,   DB_FIELD_PVR_IS_LOCAL_RECORD},
-       {PVR_CONTENT_RESOLUTION,                DB_FIELD_PVR_RESOLUTION},
-       {PVR_CONTENT_ASPECTRATIO,               DB_FIELD_PVR_ASPECTRATIO},
-       {PVR_MODIFIED_MONTH,                    DB_FIELD_PVR_MODIFIED_DATE},
-       {PVR_MODIFIED_DATE,                             DB_FIELD_PVR_MODIFIED_DATE},
-       {PVR_SPORTS_TYPE,                               DB_FIELD_PVR_SPORTS_TYPE},
-       {PVR_GUIDANCE_LENGTH,                   DB_FIELD_PVR_GUIDANCE_LENGTH},
-       {PVR_TVMODE,                                    DB_FIELD_PVR_TVMODE},
-       {PVR_PLAY_COUNT,                                DB_FIELD_PVR_PLAY_COUNT},
-       {PVR_PRIVATE_DATA,                              DB_FIELD_PVR_PRIVATE_DATA},
-
-       /* UHD */
-       {UHD_CONTENT_TITLE,                             DB_FIELD_UHD_CONTENT_TITLE},
-       {UHD_RELEASE_DATE,                              DB_FIELD_UHD_RELEASE_DATE},
-       {UHD_SUB_TYPE,                                  DB_FIELD_UHD_SUB_TYPE},
-       {UHD_FILE_NAME,                                 DB_FIELD_UHD_FILE_NAME},
-       {UHD_FOLDER_ID,                                 DB_FIELD_FOLDER_ID},
-       {UHD_PLAYED_COUNT,                              DB_FIELD_UHD_PLAYED_COUNT},
-#endif
-};
-
-static int __media_content_create_attribute_handles(void)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       int idx = 0;
-       int count = 0;
-       char *_attr_user = NULL;
-       char *_attr_platform = NULL;
-       attribute_s *_attr = NULL;
-
-       ret = _media_filter_attribute_create(&g_attr_handle);
-       media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
-
-       _attr = (attribute_s*)g_attr_handle;
-
-       count = sizeof(g_content_attrs_info) / sizeof((g_content_attrs_info)[0]);
-
-       for (idx = 0; idx < count; idx++) {
-               _attr_user = NULL;
-               _attr_platform = NULL;
-
-               if (STRING_VALID(g_content_attrs_info[idx].user_attr)) {
-                       /*attribute*/
-                       if (STRING_VALID(g_content_attrs_info[idx].platform_attr)) {
-                               _attr_user = g_strdup(g_content_attrs_info[idx].user_attr);
-                               _attr_platform = g_strdup(g_content_attrs_info[idx].platform_attr);
-
-                               if (_attr_user == NULL || _attr_platform == NULL) {
-                                       SAFE_G_FREE(_attr_user);
-                                       SAFE_G_FREE(_attr_platform);
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       ret = MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-                                       goto ERROR;
-                               }
-
-                               g_hash_table_insert(_attr->attr_map, _attr_user, _attr_platform);
-
-                       }
-               } else {
-                       media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-                       ret = MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-                       goto ERROR;
-               }
-       }
-
-       return ret;
-
-ERROR:
-       media_content_error("Fail media_content_create_attribute_handles");
-       __media_content_destroy_attribute_handle();
-
-       return ret;
-}
-
-static int __media_content_destroy_attribute_handle(void)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       ret = _media_filter_attribute_destory(g_attr_handle);
-
-       g_attr_handle = NULL;
-
-       return ret;
-}
-
-attribute_h _content_get_attirbute_handle(void)
-{
-       return g_attr_handle;
-}
-
 sqlite3 * _content_get_db_handle(void)
 {
        return db_handle;
@@ -386,18 +201,10 @@ int media_content_connect(void)
 
        if (ref_count == 0) {
                if (db_handle == NULL) {
-                       ret = __media_content_create_attribute_handles();
-                       if (ret == MEDIA_CONTENT_ERROR_NONE) {
-                               ret = media_db_connect(&db_handle, _content_get_uid(), false);
-                               ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret);
-                               if (ret == MEDIA_CONTENT_ERROR_NONE)
-                                       ref_count++;
-                               else
-                                       __media_content_destroy_attribute_handle();
-
-                       } else {
-                               media_content_error("Internal DB Connection Error");
-                       }
+                       ret = media_db_connect(&db_handle, _content_get_uid(), false);
+                       ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret);
+                       if (ret == MEDIA_CONTENT_ERROR_NONE)
+                               ref_count++;
                } else {
                        media_content_error("Wrong DB Connection status");
                        ret = MEDIA_CONTENT_ERROR_DB_FAILED;
@@ -449,7 +256,6 @@ int media_content_disconnect(void)
                        ret = media_db_disconnect(db_handle);
                        ret = _content_error_capi(MEDIA_CONTENT_TYPE, ret);
                        if (ret == MEDIA_CONTENT_ERROR_NONE) {
-                               ret = __media_content_destroy_attribute_handle();
                                db_handle = NULL;
                        } else {
                                media_content_error("database disconnect fail");
index a2bdb91..8169166 100755 (executable)
@@ -20,7 +20,7 @@
 #include <media_util_private.h>
 
 static char * __media_db_get_group_name(media_group_e group);
-static int __media_db_make_query(filter_h filter, attribute_h attr, char *select_query, int select_query_size, char **condition_query, char **option_query);
+static int __media_db_make_query(filter_h filter, char *select_query, int select_query_size, char **condition_query, char **option_query);
 
 static char * __media_db_get_group_name(media_group_e group)
 {
@@ -182,7 +182,7 @@ static char * __media_db_get_group_name(media_group_e group)
        return NULL;
 }
 
-static int __media_db_make_query(filter_h filter, attribute_h attr, char *select_query, int select_query_size, char **condition_query, char **option_query)
+static int __media_db_make_query(filter_h filter, char *select_query, int select_query_size, char **condition_query, char **option_query)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        filter_s *_filter = NULL;
@@ -191,20 +191,20 @@ static int __media_db_make_query(filter_h filter, attribute_h attr, char *select
                _filter = (filter_s*)filter;
 
                if (STRING_VALID(_filter->condition)) {
-                       ret = _media_filter_attribute_generate(attr, filter, condition_query);
+                       ret = _media_filter_attribute_generate(filter, condition_query);
                        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
                }
 
                if (_filter->is_full_order == false) {
                        /* Process for filter v1 */
-                       ret = _media_filter_attribute_option_generate(attr, filter, option_query);
+                       ret = _media_filter_attribute_option_generate(filter, option_query);
                        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                                SAFE_FREE(*condition_query);
                                return ret;
                        }
                } else {
                        /* Process for filter v2 */
-                       ret = _media_filter_attribute_option_generate_with_full_query(attr, filter, option_query);
+                       ret = _media_filter_attribute_option_generate_with_full_query(filter, option_query);
                        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                                SAFE_FREE(*condition_query);
                                return ret;
@@ -227,10 +227,8 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
        char select_query[MAX_QUERY_SIZE] = {0, };
        char *condition_query = NULL;
        char *option_query = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        switch (group_type) {
@@ -300,7 +298,7 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
                break;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -323,10 +321,8 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        char select_query[MAX_QUERY_SIZE] = {0, };
        char *condition_query = NULL;
        char *option_query = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 #ifdef _USE_TVPD_MODE
        if (group < MEDIA_PVR_GROUP_DURATION) { /*media content*/
@@ -351,7 +347,7 @@ int _media_db_get_media_group_count(media_group_e group, filter_h filter, int *g
        else
                snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_COUNT, __media_db_get_group_name(group), DB_VIEW_MEDIA);
 #endif
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
@@ -385,10 +381,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
        char *option_query = NULL;
        char *name = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
-
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 #ifdef _USE_TVPD_MODE
        if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */
@@ -413,7 +406,7 @@ int _media_db_get_media_group(media_group_e group, filter_h filter, media_group_
        else
                snprintf(select_query, sizeof(select_query), SELECT_MEDIA_GROUP_LIST, __media_db_get_group_name(group), DB_VIEW_MEDIA);
 #endif
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -446,10 +439,8 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me
        char *option_query = NULL;
        char *name = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
        memset(group_query, 0x00, sizeof(group_query));
 
@@ -476,7 +467,7 @@ int _media_db_get_media_group_and_count(media_group_e group, filter_h filter, me
                        snprintf(select_query, sizeof(select_query), SELECT_UHD_GROUP_AND_COUNT, group_name);
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        if (STRING_VALID(option_query))
@@ -513,10 +504,8 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
@@ -524,7 +513,7 @@ int _media_db_get_album(filter_h filter, media_album_cb callback, void *user_dat
        else
                snprintf(select_query, sizeof(select_query), SELECT_ALBUM_LIST, DB_VIEW_MEDIA);
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -566,10 +555,8 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
@@ -577,7 +564,7 @@ int _media_db_get_folder(filter_h filter, media_folder_cb callback, void *user_d
        else
                snprintf(select_query, sizeof(select_query), SELECT_FOLDER_LIST, DB_VIEW_MEDIA);
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -621,9 +608,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (!SAFE_STRLCPY(select_query, SELECT_PLAYLIST_LIST, sizeof(select_query))) {
@@ -631,7 +616,7 @@ int _media_db_get_playlist(filter_h filter, media_playlist_cb callback, void *us
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -671,15 +656,12 @@ int _media_db_get_playlist_item(int playlist_id, filter_h filter, playlist_membe
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
-       /*snprintf(select_query, sizeof(select_query), SELECT_PLAYLIST_ITEM_ID_FROM_PLAYLIST_VIEW, playlist_id);*/
        snprintf(select_query, sizeof(select_query), SELECT_PLAYLIST_ITEM_ALL_FROM_PLAYLIST_VIEW, playlist_id);
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -721,9 +703,7 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (!STRING_VALID(media_id)) {
@@ -734,7 +714,7 @@ int _media_db_get_tag(const char *media_id, filter_h filter, media_tag_cb callba
        } else
                snprintf(select_query, sizeof(select_query), SELECT_TAG_LIST_BY_MEDIA_ID, media_id);
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        SAFE_STRLCAT(select_query, QUERY_KEYWORD_SPACE, sizeof(select_query));
@@ -775,11 +755,8 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
-
        memset(select_query, 0x00, sizeof(select_query));
 
        if (STRING_VALID(media_id)) {   //get bookmark by media_id
@@ -794,7 +771,7 @@ int _media_db_get_bookmark(const char *media_id, filter_h filter, media_bookmark
                        snprintf(select_query, sizeof(select_query), SELECT_BOOKMARK_LIST, DB_VIEW_MEDIA);
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -838,11 +815,8 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
-
        memset(select_query, 0x00, sizeof(select_query));
 
        if (STRING_VALID(media_id)) {   //get face by media_id
@@ -857,7 +831,7 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
                        snprintf(select_query, sizeof(select_query), SELECT_FACE_LIST, DB_VIEW_MEDIA);
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -904,10 +878,8 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
        char select_query[MAX_QUERY_SIZE] = {0, };
        char *condition_query = NULL;
        char *option_query = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (group_type == MEDIA_GROUP_ALBUM) {
@@ -924,7 +896,7 @@ int _media_db_get_group_item_count_by_id(int group_id, filter_h filter, group_li
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -949,10 +921,8 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
        char *condition_query = NULL;
        char *option_query = NULL;
        bool is_simple = FALSE;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (group_type == MEDIA_GROUP_NONE) {
@@ -1012,7 +982,7 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        SQLITE3_SAFE_FREE(tmp_query);
@@ -1055,10 +1025,8 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (group_type == MEDIA_GROUP_ALBUM) {
@@ -1081,7 +1049,7 @@ int _media_db_get_group_item_by_id(int group_id, filter_h filter, media_info_cb
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -1119,10 +1087,8 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (group_type == MEDIA_GROUP_NONE) {
@@ -1142,7 +1108,7 @@ int _media_db_get_group_item(const char *group_name, filter_h filter, media_info
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -1184,12 +1150,9 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi
        char *condition_query2 = NULL;
        char *option_query2 = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter1 = (filter_s*)filter1;
        filter_s *_filter2 = (filter_s*)filter2;
 
-       attr = _content_get_attirbute_handle();
-
        memset(select_query1, 0x00, sizeof(select_query1));
 
        if ((_filter1 != NULL) && STRING_VALID(_filter1->storage_id))
@@ -1197,7 +1160,7 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi
        else
                snprintf(select_query1, sizeof(select_query1), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
 
-       ret = __media_db_make_query(filter1, attr, select_query1, sizeof(select_query1), &condition_query1, &option_query1);
+       ret = __media_db_make_query(filter1, select_query1, sizeof(select_query1), &condition_query1, &option_query1);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                SAFE_FREE(condition_query1);
                SAFE_FREE(option_query1);
@@ -1212,7 +1175,7 @@ int _media_db_get_group_item_by_union_select(const char *group_name, filter_h fi
        else
                snprintf(select_query2, sizeof(select_query2), SELECT_MEDIA_FROM_FOLDER, DB_VIEW_MEDIA, group_name);
 
-       ret = __media_db_make_query(filter2, attr, select_query2, sizeof(select_query2), &condition_query2, &option_query2);
+       ret = __media_db_make_query(filter2, select_query2, sizeof(select_query2), &condition_query2, &option_query2);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                SAFE_FREE(condition_query1);
                SAFE_FREE(option_query1);
@@ -1261,10 +1224,8 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
        char *tmp_query = NULL;
        char *condition_query = NULL;
        char *option_query = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 #ifdef _USE_TVPD_MODE
        if (group < MEDIA_PVR_GROUP_DURATION) { /*media content */
@@ -1326,7 +1287,7 @@ int _media_db_get_media_group_item_count(const char *group_name, filter_h filter
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_COUNT_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group));
        }
 #endif
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        SQLITE3_SAFE_FREE(tmp_query);
@@ -1366,10 +1327,8 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (group_name != NULL) {
@@ -1386,7 +1345,7 @@ int _media_db_get_media_group_item(const char *group_name, filter_h filter, medi
                        snprintf(select_query, sizeof(select_query), SELECT_MEDIA_FROM_GROUP_NULL, DB_VIEW_MEDIA, __media_db_get_group_name(group));
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        SQLITE3_SAFE_FREE(tmp_query);
@@ -1430,9 +1389,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (!SAFE_STRLCPY(select_query, SELECT_STORAGE_LIST, sizeof(select_query))) {
@@ -1440,7 +1397,7 @@ int _media_db_get_storage(filter_h filter, media_storage_cb callback, void *user
                return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -1482,10 +1439,8 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if (group_name != NULL) {
@@ -1502,7 +1457,7 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_
                        snprintf(select_query, sizeof(select_query), SELECT_PVR_FROM_GROUP_NULL, __media_db_get_group_name(group));
        }
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        if (ret != MEDIA_CONTENT_ERROR_NONE) {
                if (tmp_query != NULL)
                        sqlite3_free(tmp_query);
@@ -1713,10 +1668,8 @@ int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data)
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
@@ -1724,7 +1677,7 @@ int _media_db_get_pvr(filter_h filter, media_pvr_cb callback, void *user_data)
        else
                SAFE_STRLCAT(select_query, SELECT_PVR_LIST, sizeof(select_query));
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
@@ -1845,10 +1798,8 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data)
        char *condition_query = NULL;
        char *option_query = NULL;
        sqlite3_stmt *stmt = NULL;
-       attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_attirbute_handle();
        memset(select_query, 0x00, sizeof(select_query));
 
        if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
@@ -1856,7 +1807,7 @@ int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data)
        else
                SAFE_STRLCAT(select_query, SELECT_UHD_LIST, sizeof(select_query));
 
-       ret = __media_db_make_query(filter, attr, select_query, sizeof(select_query), &condition_query, &option_query);
+       ret = __media_db_make_query(filter, select_query, sizeof(select_query), &condition_query, &option_query);
        media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
        ret = _content_query_prepare(&stmt, select_query, condition_query, option_query);
index 29e023a..985fbbe 100755 (executable)
 #include <media_util_private.h>
 #include <vconf.h>
 
-static const char *media_token[] = {
-       " ",
-       "\"",
-       "'",
-       "(",
-       ")",
-       "=",
-       "<=",
-       "<",
-       ">=",
-       ">",
-       "!=",
-};
-
-
-typedef struct _token_t {
-       int type;
-       char *str;
-} token_t;
-
-#define UNKNOWN_TYPE 1000
-#define STRING_TYPE 100
-
-static char *__get_order_str(media_content_order_e order_enum);
-static char *__get_collate_str(media_content_collation_e collate_type);
-static void __filter_attribute_free_value(gpointer key, gpointer value, gpointer user_data);
-static char *__media_filter_replace_attr(attribute_h attr, char *name);
-static int __tokenize_operator(token_t *token, const char *str, int op_type);
-static int __tokenize(GList **token_list, const char *str);
-
 static bool __is_pinyin_needed(void)
 {
        char *lang = NULL;
@@ -79,9 +49,9 @@ static char *__get_order_str(media_content_order_e order_enum)
 {
        switch (order_enum) {
        case MEDIA_CONTENT_ORDER_ASC:
-               return (char *)"ASC";
+               return (char *)"ASC ";
        case MEDIA_CONTENT_ORDER_DESC:
-               return (char *)"DESC";
+               return (char *)"DESC ";
        default:
                return (char *)" ";
        }
@@ -91,618 +61,24 @@ static char *__get_collate_str(media_content_collation_e collate_type)
 {
        switch (collate_type) {
        case MEDIA_CONTENT_COLLATE_NOCASE:
-               return (char *)"NOCASE";
+               return (char *)"NOCASE ";
        case MEDIA_CONTENT_COLLATE_RTRIM:
-               return (char *)"RTRIM";
+               return (char *)"RTRIM ";
        case MEDIA_CONTENT_COLLATE_LOCALIZED:
                if (__is_pinyin_needed())
-                       return (char *)"NOCASE";
+                       return (char *)"NOCASE ";
                else
-                       return (char *)"localized";
+                       return (char *)"localized ";
        default: return (char *)" ";
        }
 }
 
-static void __filter_attribute_free_value(gpointer key, gpointer value, gpointer user_data)
-{
-       SAFE_G_FREE(key);
-       SAFE_G_FREE(value);
-}
-
-static char *__media_filter_replace_attr(attribute_h attr, char *name)
-{
-       char *key_temp = NULL;
-       char *generated_value = NULL;
-       attribute_s *_attr = (attribute_s *)attr;
-
-       if (!g_hash_table_lookup_extended(_attr->attr_map, name, (gpointer)&key_temp, (gpointer)&generated_value)) {
-               /* can't find the value */
-               /* media_content_error("NOT_FOUND_VALUE(%s)", name); */
-               return NULL;
-       }
-
-       if (STRING_VALID(generated_value))
-               return strdup(generated_value);
-
-       media_content_error("__media_filter_replace_attr fail");
-
-       return NULL;
-}
-
-static int __tokenize_operator(token_t *token, const char *str, int op_type)
-{
-       int ret = 0;
-       const char *tmp = str;
-
-       if (token != NULL && STRING_VALID(tmp)) {
-               token->type = op_type;
-               int token_size = strlen(media_token[op_type]);
-               media_content_retvm_if(token_size == 0, -1, "Invalid token_size. op_type[%d]", op_type);
-
-               token->str = (char*)calloc(token_size+1, sizeof(char));
-               media_content_retvm_if(token->str == NULL, -1, "OUT_OF_MEMORY");
-
-               strncpy(token->str, tmp, token_size);
-               /*media_content_debug("type : [%d] str : [%s]", token->type, token->str);*/
-               ret = token_size;
-       } else {
-               ret = -1;
-       }
-
-       return ret;
-}
-
-static int __tokenize_string(token_t *token, const char *str, int size)
-{
-       int ret = size;
-       const char *tmp = str;
-
-       if (token != NULL && STRING_VALID(tmp) && size > 0) {
-               token->str = (char*)calloc(size+1, sizeof(char));
-               media_content_retvm_if(token->str == NULL, -1, "OUT_OF_MEMORY");
-
-               token->type = UNKNOWN_TYPE;
-               strncpy(token->str, tmp, size);
-               /*media_content_debug("type : [%d] str : [%s]", token->type, token->str);*/
-       } else {
-               ret = -1;
-       }
-
-       return ret;
-}
-
-static int __tokenize_attribute(GList **token_list, const char *str)
+int _media_filter_attribute_generate(filter_h filter, char **generated_condition)
 {
-       int ret = 0;
-       int idx = 0;
-
-       media_content_retvm_if(!STRING_VALID(str), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Parameter string is invalid");
-
-       const char *tmp = str;
-       const char *dst_ptr = str + strlen(str);
-
-       for (idx = 0; (*(tmp+idx)) && (tmp < dst_ptr); idx++) {
-               /*media_content_debug("[%d] '%c'", idx, tmp[idx]);*/
-               if (tmp[idx] == ' ') {          /* " " */
-                       if (idx == 0) {         /* ignore the space. */
-                               tmp++;
-                               idx = -1;
-                               continue;
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                       token->type = UNKNOWN_TYPE;
-                       token->str = (char*)calloc(idx+1, sizeof(char));
-                       if (token->str == NULL) {
-                               SAFE_FREE(token);
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return -1;
-                       }
-                       strncpy(token->str, tmp, idx);
-                       /*media_content_debug("type : [%d] str : [%s]", token->type, token->str);*/
-                       *token_list = g_list_append(*token_list, token);
-                       tmp = tmp +idx + strlen(media_token[0]);
-                       idx = -1;
-               } else if (tmp[idx] == ',') {   /* " , " */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 3);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-               }
-       }
-
-       if (*tmp) {                     /* remained string */
-               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-               ret = __tokenize_string(token, tmp, idx);
-               if (ret < 0) {
-                       SAFE_FREE(token);
-                       media_content_error("tokenize error occured");
-                       return -1;
-               }
-
-               if (token != NULL && STRING_VALID(token->str)) {
-                       *token_list = g_list_append(*token_list, token);
-               } else {
-                       SAFE_FREE(token);
-                       media_content_error("tokenize error occured");
-                       return -1;
-               }
-       }
-
-       return MEDIA_CONTENT_ERROR_NONE;
-}
-
-static int __tokenize(GList **token_list, const char *str)
-{
-       int ret = 0;
-       int idx = 0;
-
-       media_content_retvm_if(!STRING_VALID(str), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Parameter string is invalid");
-
-       const char *tmp = str;
-       const char *dst_ptr = str + strlen(str);
-
-       for (idx = 0; (*(tmp+idx)) && (tmp < dst_ptr); idx++) {
-               /* media_content_debug("[%d] '%c'", idx, tmp[idx]); */
-               if (tmp[idx] == media_token[0][0]) {            /* " " */
-                       if (idx == 0) {         /* ignore the space. */
-                               tmp++;
-                               idx = -1;
-                               continue;
-                       }
-
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                       token->type = UNKNOWN_TYPE;
-                       token->str = (char *)calloc(idx+1, sizeof(char));
-                       if (token->str == NULL) {
-                               SAFE_FREE(token);
-                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                               return -1;
-                       }
-                       strncpy(token->str, tmp, idx);
-                       /* media_content_debug("type : [%d] str : [%s]", token->type, token->str); */
-                       *token_list = g_list_append(*token_list, token);
-                       tmp = tmp +idx + strlen(media_token[0]);
-                       idx = -1;
-               } else if (tmp[idx] == media_token[1][0]) {     /* " \" " */
-                       int j;
-                       bool flag = false;
-                       for (j = idx+1; tmp[j]; j++) {  /* find next quotation */
-                               if (tmp[j] == media_token[1][0] && tmp[j+1] == media_token[1][0]) {
-                                       j += 1;
-                                       continue;
-                               }
-                               if (tmp[j] == media_token[1][0]) {
-                                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                                       media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                                       token->str = (char*) calloc(j+1+1, sizeof(char));
-                                       if (token->str == NULL) {
-                                               SAFE_FREE(token);
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return -1;
-                                       }
-                                       token->type = STRING_TYPE;
-                                       strncpy(token->str, tmp, j+1);
-                                       /* media_content_debug("type : [%d] str : [%s], j : %d", token->type, token->str, j); */
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + strlen(token->str);
-                                       idx = -1;
-                                       flag = true;
-                                       break;
-                               }
-                       }
-
-                       if (!flag && *tmp != '\0' && tmp[j] == '\0') {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               token->str = (char *) calloc(j+1, sizeof(char));
-                               if (token->str == NULL) {
-                                       SAFE_FREE(token);
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return -1;
-                               }
-                               token->type = UNKNOWN_TYPE;
-                               strncpy(token->str, tmp, j);
-                               /* media_content_debug("type : [%d] str : [%s]", token->type, token->str);*/
-                               *token_list = g_list_append(*token_list, token);
-                               tmp = tmp +strlen(token->str);
-                               idx = -1;
-                       }
-               } else if (tmp[idx] == media_token[2][0]) {     /* " \' "*/
-                       int j;
-                       bool flag = false;
-                       for (j = idx+1; tmp[j]; j++) {
-                               if (tmp[j] == media_token[2][0] && tmp[j+1] == media_token[2][0]) {
-                                       j += 1;
-                                       continue;
-                               }
-                               if (tmp[j] == media_token[2][0]) {
-                                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                                       media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                                       token->str = (char *) calloc(j+1+1, sizeof(char));
-                                       if (token->str == NULL) {
-                                               SAFE_FREE(token);
-                                               media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                               return -1;
-                                       }
-                                       token->type = STRING_TYPE;
-                                       strncpy(token->str, tmp, j+1);
-                                       /* media_content_debug("type : [%d] str : [%s]", token->type, token->str); */
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + strlen(token->str);
-                                       idx = -1;
-                                       flag = true;
-                                       break;
-                               }
-                       }
-
-                       if (!flag && *tmp != '\0' && tmp[j] == '\0') {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               token->str = (char*) calloc(j+1, sizeof(char));
-                               if (token->str == NULL) {
-                                       SAFE_FREE(token);
-                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                       return -1;
-                               }
-                               token->type = UNKNOWN_TYPE;
-                               strncpy(token->str, tmp, j);
-                               /* media_content_debug("type : [%d] str : [%s]", token->type, token->str); */
-                               *token_list = g_list_append(*token_list, token);
-                               tmp = tmp + strlen(token->str);
-                               idx = -1;
-                       }
-               } else if (tmp[idx] == media_token[3][0]) {     /* "(" */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 3);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-
-               } else if (tmp[idx] == media_token[4][0]) {     /* ")" */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 4);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-
-               } else if (tmp[idx] == media_token[5][0]) {     /* "=" */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 5);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-
-               } else if (tmp[idx] == media_token[6][0] && tmp[idx+1] == media_token[6][1]) {  /* "<=", */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 6);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-
-               } else if (tmp[idx] == media_token[7][0]) {     /* "<", */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 7);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-
-               } else if (tmp[idx] == media_token[8][0] && tmp[idx+1] == media_token[8][1]) {  /* ">=", */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 8);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-
-               } else if (tmp[idx] == media_token[9][0]) {     /* ">", */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 9);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-               } else if (tmp[idx] == media_token[10][0] && tmp[idx+1] == media_token[10][1]) {        /* "!=", */
-                       if (idx != 0) {
-                               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-                               ret = __tokenize_string(token, tmp, idx);
-                               if (ret < 0) {
-                                       SAFE_FREE(token);
-                                       media_content_error("tokenize error occured");
-                                       return -1;
-                               } else {
-                                       *token_list = g_list_append(*token_list, token);
-                                       tmp = tmp + idx;
-                               }
-                       }
-                       token_t *token = (token_t*)calloc(1, sizeof(token_t));
-                       int size = __tokenize_operator(token, tmp, 10);
-
-                       if (token != NULL && STRING_VALID(token->str)) {
-                               *token_list = g_list_append(*token_list, token);
-                               tmp += size;
-                               idx = -1;
-                       } else {
-                               SAFE_FREE(token);
-                               media_content_error("tokenize error occured");
-                               return -1;
-                       }
-               }
-       }
-
-       if (*tmp) {                     /* remained string */
-               token_t *token = (token_t*)calloc(1, sizeof(token_t));
-               media_content_retvm_if(token == NULL, -1, "OUT_OF_MEMORY");
-
-               ret = __tokenize_string(token, tmp, idx);
-               if (ret < 0) {
-                       SAFE_FREE(token);
-                       media_content_error("tokenize error occured");
-                       return -1;
-               }
-
-               if (token != NULL && STRING_VALID(token->str)) {
-                       *token_list = g_list_append(*token_list, token);
-               } else {
-                       SAFE_FREE(token);
-                       media_content_error("tokenize error occured");
-                       return -1;
-               }
-       }
-
-       return MEDIA_CONTENT_ERROR_NONE;
-}
-
-int _media_filter_attribute_create(attribute_h *attr)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-
-       media_content_retvm_if(attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr");
-
-       attribute_s *_attr = (attribute_s*)calloc(1, sizeof(attribute_s));
-       media_content_retvm_if(_attr == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-       _attr->attr_map = g_hash_table_new(g_str_hash, g_str_equal);
-       *attr = (attribute_h)_attr;
-
-       return ret;
-}
-
-int _media_filter_attribute_add(attribute_h attr, const char *user_attr, const char *platform_attr)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       char *_user = NULL;
-       char *_platform = NULL;
-       attribute_s *_attr = (attribute_s*)attr;
-
-       media_content_retvm_if(_attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr");
-
-       if (STRING_VALID(user_attr) && STRING_VALID(platform_attr)) {
-               _user = g_strdup(user_attr);
-               media_content_retvm_if(_user == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
-
-               _platform = g_strdup(platform_attr);
-               if (_platform == NULL) {
-                       SAFE_G_FREE(_user);
-                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               }
-
-               g_hash_table_insert(_attr->attr_map, _user, _platform);
-       } else {
-               media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       return ret;
-}
-
-int _media_filter_attribute_destory(attribute_h attr)
-{
-       int ret = MEDIA_CONTENT_ERROR_NONE;
-       attribute_s *_attr = (attribute_s*)attr;
-
-       media_content_retvm_if(_attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr");
-
-       if (_attr->attr_map != NULL) {
-               g_hash_table_foreach(_attr->attr_map, __filter_attribute_free_value, NULL);
-               g_hash_table_destroy(_attr->attr_map);
-       }
-
-       SAFE_FREE(_attr);
-
-       return ret;
-}
-
-int _media_filter_attribute_generate(attribute_h attr, filter_h filter, char **generated_condition)
-{
-       unsigned int idx = 0;
-       GList *token_list = NULL;
        int ret = MEDIA_CONTENT_ERROR_NONE;
-       token_t *token;
        filter_s *_filter = NULL;
        char tmp_condition[MAX_QUERY_SIZE] = {0, };
 
-       media_content_retvm_if(attr == NULL, MEDIA_CONTENT_ERROR_DB_FAILED, "DB field mapping table doesn't exist. Check db connection");
        media_content_retvm_if(filter == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid filter");
        media_content_retvm_if(generated_condition == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid generated_condition");
 
@@ -712,46 +88,15 @@ int _media_filter_attribute_generate(attribute_h attr, filter_h filter, char **g
        media_content_retvm_if(_filter->condition_collate_type < MEDIA_CONTENT_COLLATE_DEFAULT ||
                _filter->condition_collate_type > MEDIA_CONTENT_COLLATE_LOCALIZED, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid condition collate");
 
-       if (__tokenize(&token_list, _filter->condition) < 0) {
-               media_content_error("INVALID_PARAMETER(0x%08x):Invalid the condition", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-       }
-
-       for (idx = 0; idx < g_list_length(token_list); idx++) {
-               token = (token_t*)g_list_nth_data(token_list, idx);
-
-               if ((token != NULL) && (token->type == UNKNOWN_TYPE)) {
-                       char *replace_str = __media_filter_replace_attr(attr, token->str);
-                       if (STRING_VALID(replace_str)) {
-                               SAFE_FREE(token->str);
-                               token->str = replace_str;
-                       } else {
-                               SAFE_FREE(replace_str);
-                       }
-               }
-       }
-
        /* make the statment */
        memset(tmp_condition, 0, sizeof(tmp_condition));
        SAFE_STRLCAT(tmp_condition, QUERY_KEYWORD_OPEN_BRACKET, sizeof(tmp_condition));
-
-       for (idx = 0; idx < g_list_length(token_list); idx++) {
-               token = (token_t*)g_list_nth_data(token_list, idx);
-
-               if ((token != NULL) && STRING_VALID(token->str)) {
-                       SAFE_STRLCAT(tmp_condition, token->str, sizeof(tmp_condition));
-                       SAFE_STRLCAT(tmp_condition, QUERY_KEYWORD_SPACE, sizeof(tmp_condition));
-
-                       SAFE_FREE(token->str);
-                       SAFE_FREE(token);
-               }
-       }
+       SAFE_STRLCAT(tmp_condition, _filter->condition, sizeof(tmp_condition));
 
        /* Process for filter v1 */
        if (_filter->is_full_condition == false && _filter->condition_collate_type != MEDIA_CONTENT_COLLATE_DEFAULT) {
                SAFE_STRLCAT(tmp_condition, QUERY_KEYWORD_COLLATE, sizeof(tmp_condition));
                SAFE_STRLCAT(tmp_condition, __get_collate_str(_filter->condition_collate_type), sizeof(tmp_condition));
-               SAFE_STRLCAT(tmp_condition, QUERY_KEYWORD_SPACE, sizeof(tmp_condition));
        }
 
        SAFE_STRLCAT(tmp_condition, QUERY_KEYWORD_BRACKET, sizeof(tmp_condition));
@@ -763,22 +108,16 @@ int _media_filter_attribute_generate(attribute_h attr, filter_h filter, char **g
 
        media_content_sec_debug("Condition : %s", *generated_condition);
 
-       if (token_list != NULL) {
-               g_list_free(token_list);
-               token_list = NULL;
-       }
-
        return ret;
 }
 
-int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, char **generated_option)
+int _media_filter_attribute_option_generate(filter_h filter, char **generated_option)
 {
        int ret = MEDIA_CONTENT_ERROR_NONE;
        filter_s *_filter = NULL;
        char query[DEFAULT_QUERY_SIZE] = {0, };
        char option[DEFAULT_QUERY_SIZE] = {0, };
 
-       media_content_retvm_if(attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr");
        media_content_retvm_if(filter == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid filter");
 
        _filter = (filter_s*)filter;
@@ -788,63 +127,16 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c
        /* Order by*/
        if (STRING_VALID(_filter->order_keyword)) {
                if ((_filter->order_type == MEDIA_CONTENT_ORDER_ASC) || (_filter->order_type == MEDIA_CONTENT_ORDER_DESC)) {
-                       unsigned int idx = 0;
-                       GList *token_list = NULL;
-                       token_t *token;
-                       char *attr_str;
-
-                       if (__tokenize_attribute(&token_list, _filter->order_keyword) < 0) {
-                               media_content_error("INVALID_PARAMETER(0x%08x):Invalid the condition", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-                               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-                       }
-
-                       for (idx = 0; idx < g_list_length(token_list); idx++) {
-                               token = (token_t*)g_list_nth_data(token_list, idx);
-
-                               if ((token != NULL) && (token->type == UNKNOWN_TYPE)) {
-                                       char *replace_str = __media_filter_replace_attr(attr, token->str);
-                                       if (STRING_VALID(replace_str)) {
-                                               attr_str = (char*)calloc(strlen(replace_str) + COLLATE_STR_SIZE + 1, sizeof(char));
-                                               if (attr_str == NULL) {
-                                                       media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
-                                                       SAFE_FREE(replace_str);
-                                                       continue;
-                                               }
-
-                                               if (_filter->order_collate_type == MEDIA_CONTENT_COLLATE_NOCASE || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_RTRIM || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_LOCALIZED)
-                                                       snprintf(attr_str, strlen(replace_str) + COLLATE_STR_SIZE + 1, "%s COLLATE %s %s", replace_str, __get_collate_str(_filter->order_collate_type), __get_order_str(_filter->order_type));
-                                               else
-                                                       snprintf(attr_str, strlen(replace_str) + COLLATE_STR_SIZE + 1, "%s %s", replace_str, __get_order_str(_filter->order_type));
-
-                                               SAFE_FREE(token->str);
-                                               token->str = attr_str;
-                                               SAFE_FREE(replace_str);
-                                       } else {
-                                               media_content_error("There is no matched db field for %s", token->str);
-                                               SAFE_FREE(replace_str);
-                                       }
-                               }
-                       }
-
-                       /* make the statment */
                        SAFE_STRLCAT(query, QUERY_KEYWORD_ORDER_BY, sizeof(query));
+                       SAFE_STRLCAT(query, _filter->order_keyword, sizeof(query));
 
-                       for (idx = 0; idx < g_list_length(token_list); idx++) {
-                               token = (token_t*)g_list_nth_data(token_list, idx);
-
-                               if ((token != NULL) && STRING_VALID(token->str)) {
-                                       SAFE_STRLCAT(query, token->str, sizeof(query));
-                                       SAFE_STRLCAT(query, QUERY_KEYWORD_SPACE, sizeof(query));
-
-                                       SAFE_FREE(token->str);
-                                       SAFE_FREE(token);
-                               }
-                       }
-
-                       if (token_list != NULL) {
-                               g_list_free(token_list);
-                               token_list = NULL;
+                       if (_filter->order_collate_type == MEDIA_CONTENT_COLLATE_NOCASE || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_RTRIM || _filter->order_collate_type == MEDIA_CONTENT_COLLATE_LOCALIZED) {
+                               SAFE_STRLCAT(query, QUERY_KEYWORD_COLLATE, sizeof(query));
+                               SAFE_STRLCAT(query, __get_collate_str(_filter->order_collate_type), sizeof(query));
+                       } else {
+                               SAFE_STRLCAT(query, QUERY_KEYWORD_SPACE, sizeof(query));
                        }
+                       SAFE_STRLCAT(query, __get_order_str(_filter->order_type), sizeof(query));
                } else {
                        SAFE_STRLCAT(query, _filter->order_keyword, sizeof(query));
                }
@@ -868,17 +160,13 @@ int _media_filter_attribute_option_generate(attribute_h attr, filter_h filter, c
        return ret;
 }
 
-int _media_filter_attribute_option_generate_with_full_query(attribute_h attr, filter_h filter, char **generated_option)
+int _media_filter_attribute_option_generate_with_full_query(filter_h filter, char **generated_option)
 {
-       unsigned int idx = 0;
-       GList *token_list = NULL;
        int ret = MEDIA_CONTENT_ERROR_NONE;
-       token_t *token = NULL;
        filter_s * _filter = NULL;
        char query[DEFAULT_QUERY_SIZE] = {0, };
        char option[DEFAULT_QUERY_SIZE] = {0, };
 
-       media_content_retvm_if(attr == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid attr");
        media_content_retvm_if(filter == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid filter");
        media_content_retvm_if(generated_option == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid generated_option");
 
@@ -888,44 +176,8 @@ int _media_filter_attribute_option_generate_with_full_query(attribute_h attr, fi
 
        /* Order by*/
        if (STRING_VALID(_filter->order_keyword)) {
-               if (__tokenize_attribute(&token_list, _filter->order_keyword) < 0) {
-                       media_content_error("INVALID_PARAMETER(0x%08x):Invalid the order", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               }
-
-               for (idx = 0; idx < g_list_length(token_list); idx++) {
-                       token = (token_t*)g_list_nth_data(token_list, idx);
-
-                       if ((token != NULL) && (token->type == UNKNOWN_TYPE)) {
-                               char *replace_str = __media_filter_replace_attr(attr, token->str);
-                               if (STRING_VALID(replace_str)) {
-                                       SAFE_FREE(token->str);
-                                       token->str = replace_str;
-                               } else {
-                                       SAFE_FREE(replace_str);
-                               }
-                       }
-               }
-
-               /* make the statment */
                SAFE_STRLCAT(query, QUERY_KEYWORD_ORDER_BY, sizeof(query));
-
-               for (idx = 0; idx < g_list_length(token_list); idx++) {
-                       token = (token_t*)g_list_nth_data(token_list, idx);
-
-                       if ((token != NULL) && STRING_VALID(token->str)) {
-                               SAFE_STRLCAT(query, token->str, sizeof(query));
-                               SAFE_STRLCAT(query, QUERY_KEYWORD_SPACE, sizeof(query));
-
-                               SAFE_FREE(token->str);
-                               SAFE_FREE(token);
-                       }
-               }
-
-               if (token_list != NULL) {
-                       g_list_free(token_list);
-                       token_list = NULL;
-               }
+               SAFE_STRLCAT(query, _filter->order_keyword, sizeof(query));
        }
 
        /* offset */
index eaeb616..af7f7b1 100755 (executable)
@@ -1880,19 +1880,19 @@ int media_info_update_to_db(media_info_h media)
 #ifdef _USE_TVPD_MODE
 #ifdef _USE_SENIOR_MODE
                if (_media_content_is_support_senior_mode()) {
-                       set_sql = sqlite3_mprintf("file_name=%Q, description=%Q, longitude=%f, latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, rating=%d, favourite=%d, contact=%Q, app_data=%Q",
+                       set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, media_rating=%d, media_favourite=%d, contact=%Q, app_data=%Q",
                                _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite, _media->contact, _media->app_data);
                } else
 #endif
                {
-                       set_sql = sqlite3_mprintf("file_name=%Q, description=%Q, longitude=%f, latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, rating=%d, favourite=%d",
+                       set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, played_count=%d, last_played_time=%d, last_played_position=%d, media_rating=%d, media_favourite=%d",
                                _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->played_count, _media->played_time, _media->played_position, _media->rating, _media->favourite);
                }
 #else
-               set_sql = sqlite3_mprintf("file_name=%Q, description=%Q, longitude=%f, latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, rating=%d, favourite=%d", _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->rating, _media->favourite);
+               set_sql = sqlite3_mprintf("media_display_name=%Q, media_description=%Q, media_longitude=%f, media_latitude=%f, media_file_name_pinyin=%Q, media_description_pinyin=%Q, media_rating=%d, media_favourite=%d", _media->display_name, _media->description, _media->longitude, _media->latitude, file_name_pinyin, description_pinyin, _media->rating, _media->favourite);
 #endif
 
-               sql = sqlite3_mprintf("UPDATE %Q SET %s WHERE media_uuid=%Q", _media->storage_uuid, set_sql, _media->media_id);
+               sql = sqlite3_mprintf("UPDATE %Q SET %s WHERE media_id=%Q", _media->storage_uuid, set_sql, _media->media_id);
 
                ret = _content_query_sql(sql);
                SQLITE3_SAFE_FREE(set_sql);
index 9e75b30..74f2dab 100755 (executable)
@@ -878,7 +878,7 @@ int media_playlist_import_from_file(const char *path, const char *playlist_name,
                        media_content_error("error media_filter_create");
                        return ret;
                }
-               condition = sqlite3_mprintf("path = '%q'", import_item_list[idx]);
+               condition = sqlite3_mprintf("media_path = '%q'", import_item_list[idx]);
                ret = media_filter_set_condition(filter, condition, MEDIA_CONTENT_COLLATE_DEFAULT);
                if (ret != MEDIA_CONTENT_ERROR_NONE) {
                        __media_playlist_destroy_import_item(import_item_list, import_item_count);
index 884eccc..fc35ece 100755 (executable)
@@ -58,7 +58,7 @@ static int __media_tag_insert_item_to_tag(int tag_id, const char *media_id)
        int ret = MEDIA_CONTENT_ERROR_NONE;
        char *query_str = NULL;
 
-       query_str = sqlite3_mprintf("INSERT INTO %q (tag_id, media_uuid) values (%d, '%q');", DB_TABLE_TAG_MAP, tag_id, media_id);
+       query_str = sqlite3_mprintf("INSERT INTO %q (tag_id, media_id) values (%d, '%q');", DB_TABLE_TAG_MAP, tag_id, media_id);
        ret = media_svc_append_query(query_str, _content_get_uid());
 
        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);