Remove unused define for query

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 597144c..c7b42b6 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -411,7 +411,6 @@ typedef struct _media_content_cb_data {
 #define DB_TABLE_ALIAS_PLAYLIST_MAP    "pm"
 #define DB_TABLE_ALIAS_TAG                             "t"
 #define DB_TABLE_ALIAS_BOOKMARK                "b"
-#define DB_TABLE_ALIAS_ALBUM                   "a"
 #define DB_TABLE_ALIAS_FACE                            "fa"
 
 /* DB field for media */
@@ -464,10 +463,7 @@ typedef struct _media_content_cb_data {
 #define DB_FIELD_MEDIA_WEATHER                 "weather"
 #define DB_FIELD_MEDIA_IS_DRM                          "is_drm"
 #define DB_FIELD_MEDIA_STORAGE_TYPE            "storage_type"
-#define DB_FIELD_MEDIA_EXPOSURE_TIME   "exposure_time"
-#define DB_FIELD_MEDIA_FNUMBER                 "fnumber"
-#define DB_FIELD_MEDIA_ISO                             "iso"
-#define DB_FIELD_MEDIA_MODEL                   "model"
+
 #define DB_FIELD_MEDIA_FILE_NAME_PINYIN                        "file_name_pinyin"
 #define DB_FIELD_MEDIA_TITLE_PINYIN                                    "title_pinyin"
 #define DB_FIELD_MEDIA_ALBUM_PINYIN                            "album_pinyin"
@@ -511,11 +507,6 @@ typedef struct _media_content_cb_data {
 #define DB_FIELD_BOOKMARK_MARKED_TIME  "marked_time"
 #define DB_FIELD_BOOKMARK_NAME "name"
 
-/* DB field for album*/
-#define DB_FIELD_ALBUM_ID                      "album_id"
-#define DB_FIELD_ALBUM_NAME            "name"
-#define DB_FIELD_ALBUM_ARTIST          "artist"
-
 /* DB field for Storage*/
 #define DB_FIELD_STORAGE_ID                    "storage_uuid"
 #define DB_FIELD_STORAGE_PATH          "storage_path"
@@ -536,7 +527,6 @@ typedef struct _media_content_cb_data {
 #define QUERY_KEYWORD_COLLATE "COLLATE "
 
 /* DB TABLE JOIN */
-/*#define FOLDER_MEDIA_JOIN                                    "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1) " */
 #define FOLDER_MEDIA_JOIN                                      "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.validity=1 "
 #define BOOKMARK_MEDIA_JOIN                            "("DB_TABLE_BOOKMARK" AS b INNER JOIN '%s' AS m ON (b.media_uuid = m.media_uuid)) WHERE m.validity=1"
 #define ALBUM_MEDIA_JOIN                                       "("DB_TABLE_ALBUM" AS a INNER JOIN '%s' AS m ON (a.album_id = m.album_id)) WHERE m.validity=1"
@@ -575,7 +565,6 @@ typedef struct _media_content_cb_data {
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM                "SELECT * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
 #define SELECT_FOLDER_FROM_FOLDER              "SELECT * FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
-#define SELECT_FOLDER_BY_PATH                  "SELECT * FROM "DB_TABLE_FOLDER" WHERE path='%q'"
 #define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT * FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
 #define SELECT_TAG_FROM_TAG                    "SELECT * FROM "DB_TABLE_TAG" WHERE tag_id=%d"
 #define SELECT_TAG_BY_NAME                             "SELECT * FROM "DB_TABLE_TAG" WHERE name='%q'"
@@ -600,7 +589,6 @@ typedef struct _media_content_cb_data {
 #define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST                     "UPDATE "DB_TABLE_PLAYLIST" SET name='%q' WHERE playlist_id=%d;"
 #define UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST                "UPDATE "DB_TABLE_PLAYLIST" SET thumbnail_path='%q' WHERE playlist_id=%d;"
 #define SELECT_PLAYLIST_ID_FROM_PLAYLIST                               "SELECT playlist_id FROM "DB_TABLE_PLAYLIST" WHERE name='%q'"
-#define SELECT_PLAYLIST_ITEM_ID_FROM_PLAYLIST_VIEW     "SELECT pm_id, media_uuid FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
 #define SELECT_PLAYLIST_ITEM_ALL_FROM_PLAYLIST_VIEW    "SELECT "MEDIA_INFO_ITEM", pm_id FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
 #define SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW                   "SELECT play_order FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d and pm_id=%d"
 #define SELECT_MAX_PLAY_ORDER_FROM_PLAYLIST_VIEW       "SELECT MAX(play_order) FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d"
@@ -656,12 +644,9 @@ typedef struct _media_content_cb_data {
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
 #define SELECT_FACE_LIST                                               "SELECT fa.face_id, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT fa.face_id, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_PATH_FROM_MEDIA            "SELECT path FROM "DB_VIEW_MEDIA" media_uuid='%s'"
 #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_id=%d)"
 #define SELECT_FACE_ID                 "SELECT face_id FROM "DB_TABLE_FACE" WHERE media_uuid='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND orientation=%d"
 
-#define DEFAULT_MEDIA_STORAGE_ID                       "media"
-
 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);

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index fa9a853..04d03f4 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -506,7 +506,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_TABLE_ALIAS_PLAYLIST_MAP    "pm"
 #define DB_TABLE_ALIAS_TAG                             "t"
 #define DB_TABLE_ALIAS_BOOKMARK                "b"
-#define DB_TABLE_ALIAS_ALBUM                   "a"
 #define DB_TABLE_ALIAS_FACE                            "fa"
 
 /* DB field for media */
@@ -562,10 +561,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #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_EXPOSURE_TIME   "exposure_time"
-#define DB_FIELD_MEDIA_FNUMBER                 "fnumber"
-#define DB_FIELD_MEDIA_ISO                             "iso"
-#define DB_FIELD_MEDIA_MODEL                   "model"
+
 #define DB_FIELD_MEDIA_FILE_NAME_PINYIN                        "file_name_pinyin"
 #define DB_FIELD_MEDIA_TITLE_PINYIN                                    "title_pinyin"
 #define DB_FIELD_MEDIA_ALBUM_PINYIN                            "album_pinyin"
@@ -614,11 +610,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_BOOKMARK_MARKED_TIME  "marked_time"
 #define DB_FIELD_BOOKMARK_NAME "name"
 
-/* DB field for album*/
-#define DB_FIELD_ALBUM_ID                      "album_id"
-#define DB_FIELD_ALBUM_NAME            "name"
-#define DB_FIELD_ALBUM_ARTIST          "artist"
-
 /* DB field for Storage*/
 #define DB_FIELD_STORAGE_ID                    "storage_uuid"
 #define DB_FIELD_STORAGE_PATH          "storage_path"
@@ -691,7 +682,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define QUERY_KEYWORD_COLLATE "COLLATE "
 
 /* DB TABLE JOIN */
-/*#define FOLDER_MEDIA_JOIN                                    "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1) " */
 #define FOLDER_MEDIA_JOIN                                      "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.validity=1 "
 #define BOOKMARK_MEDIA_JOIN                            "("DB_TABLE_BOOKMARK" AS b INNER JOIN '%s' AS m ON (b.media_uuid = m.media_uuid)) WHERE m.validity=1"
 #define ALBUM_MEDIA_JOIN                                       "("DB_TABLE_ALBUM" AS a INNER JOIN '%s' AS m ON (a.album_id = m.album_id)) WHERE m.validity=1"
@@ -733,7 +723,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 /* Get Group Info by Group ID*/
 #define SELECT_ALBUM_FROM_ALBUM                "SELECT * FROM "DB_TABLE_ALBUM" WHERE album_id=%d"
 #define SELECT_FOLDER_FROM_FOLDER              "SELECT * FROM "DB_TABLE_FOLDER" WHERE folder_uuid='%s'"
-#define SELECT_FOLDER_BY_PATH                  "SELECT * FROM "DB_TABLE_FOLDER" WHERE path='%q'"
 #define SELECT_PLAYLIST_FROM_PLAYLIST  "SELECT * FROM "DB_TABLE_PLAYLIST" WHERE playlist_id=%d"
 #define SELECT_TAG_FROM_TAG                    "SELECT * FROM "DB_TABLE_TAG" WHERE tag_id=%d"
 #define SELECT_TAG_BY_NAME                             "SELECT * FROM "DB_TABLE_TAG" WHERE name='%q'"
@@ -763,7 +752,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define UPDATE_PLAYLIST_NAME_FROM_PLAYLIST                     "UPDATE "DB_TABLE_PLAYLIST" SET name='%q' WHERE playlist_id=%d;"
 #define UPDATE_PLAYLIST_THUMBNAIL_FROM_PLAYLIST                "UPDATE "DB_TABLE_PLAYLIST" SET thumbnail_path='%q' WHERE playlist_id=%d;"
 #define SELECT_PLAYLIST_ID_FROM_PLAYLIST                               "SELECT playlist_id FROM "DB_TABLE_PLAYLIST" WHERE name='%q'"
-#define SELECT_PLAYLIST_ITEM_ID_FROM_PLAYLIST_VIEW     "SELECT pm_id, media_uuid FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
 #define SELECT_PLAYLIST_ITEM_ALL_FROM_PLAYLIST_VIEW    "SELECT "MEDIA_INFO_ITEM", pm_id FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and media_count>0) "
 #define SELECT_PLAY_ORDER_FROM_PLAYLIST_VIEW                   "SELECT play_order FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d and pm_id=%d"
 #define SELECT_MAX_PLAY_ORDER_FROM_PLAYLIST_VIEW       "SELECT MAX(play_order) FROM "DB_VIEW_PLAYLIST" WHERE playlist_id=%d"
@@ -782,13 +770,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 /* Update Meta*/
 #define UPDATE_IMAGE_META_FROM_MEDIA   "UPDATE '%s' SET orientation=%d WHERE media_uuid='%q'"
 
-#define UPDATE_VIDEO_MM_DATA_FROM_MEDIA                "UPDATE '%s' SET bitrate=%d, duration=%d, width=%d, height=%d WHERE media_uuid='%q'"
-#define UPDATE_AUDIO_MM_DATA_FROM_MEDIA                "UPDATE '%s' SET duration=%d, bitrate=%d, bitpersample=%d, samplerate=%d, channel=%d WHERE media_uuid='%q'"
-#define UPDATE_IMAGE_MM_DATA_FROM_MEDIA                "UPDATE '%s' SET width=%d, height=%d WHERE media_uuid='%q'"
-#define SELECT_VIDEO_MM_DATA_FROM_MEDIA                "SELECT bitrate, duration, width, height FROM '%s' WHERE media_uuid='%q'"
-#define SELECT_AUDIO_MM_DATA_FROM_MEDIA                "SELECT duration, bitrate, bitpersample, samplerate, channel FROM '%s' WHERE media_uuid='%q'"
-#define SELECT_IMAGE_MM_DATA_FROM_MEDIA                "SELECT width, height FROM '%s' WHERE media_uuid='%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'"
@@ -826,12 +807,9 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
 #define SELECT_FACE_LIST                                               "SELECT fa.face_id, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT fa.face_id, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_PATH_FROM_MEDIA            "SELECT path FROM "DB_VIEW_MEDIA" media_uuid='%s'"
 #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_id=%d)"
 #define SELECT_FACE_ID                 "SELECT face_id FROM "DB_TABLE_FACE" WHERE media_uuid='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND orientation=%d"
 
-#define DEFAULT_MEDIA_STORAGE_ID                       "media"
-
 #define SELECT_VALID_STORAGE_FROM_PVR  "WHERE storage_uuid IN (SELECT storage_uuid 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

diff --git a/src/media_info.c b/src/media_info.c
index 0c4b057..c78d2ee 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -530,7 +530,7 @@ int media_info_insert_to_db(const char *path, media_info_h *info)
        if (STRING_VALID(storage_id))
                ret = _media_info_get_media_info_from_db(repl_path, storage_id, (media_info_h)_media);
        else
-               ret = _media_info_get_media_info_from_db(repl_path, DEFAULT_MEDIA_STORAGE_ID, (media_info_h)_media);
+               ret = _media_info_get_media_info_from_db(repl_path, DB_TABLE_MEDIA, (media_info_h)_media);
 
        *info = (media_info_h)_media;
        return ret;