Remove unused queries

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index a4e95f3..e7675a4 100644 (file)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -388,7 +388,6 @@ typedef struct _media_content_cb_data {
 #define SELECT_MEDIA_COUNT_FROM_GROUP  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP
 #define SELECT_MEDIA_COUNT_FROM_GROUP_NULL     "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL
 #define SELECT_MEDIA_COUNT_FROM_FOLDER "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND folder_id='%s'"
-#define SELECT_MEDIA_COUNT_FROM_STORAGE        "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity IN (1, 2) AND storage_uuid='%s'"
 #define SELECT_MEDIA_COUNT_FROM_TAG    "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) "
 #define SELECT_MEDIA_COUNT_FROM_PLAYLIST       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and playlist_media_count>0) "
 

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index 4a4ce6a..6792781 100644 (file)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -496,7 +496,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_PVR_PLAY_COUNT                                        "play_count"
 #define DB_FIELD_PVR_PRIVATE_DATA               "private_data"
 
-/* DB fiedl for UHD */
+/* DB fields for UHD */
 #define DB_FIELD_UHD_CONTENT_TITLE             "content_title"
 #define DB_FIELD_UHD_RELEASE_DATE                      "release_date"
 #define DB_FIELD_UHD_FILE_NAME                 "file_name"
@@ -531,13 +531,12 @@ typedef struct _media_content_scan_cb_data_v2 {
 /*count(distinct x) count only non-null values, but select distinct X returns include null. so sync the result of count and list, don't use count(distinct x)*/
 
 /* Get Media Count of Group */
-#define SELECT_MEDIA_COUNT_FROM_MEDIA                  "SELECT COUNT(*) FROM (SELECT media_id FROM '%s' WHERE validity=1 "             /*to apply limit condition. "SELECT COUNT(*) FROM "DB_TABLE_MEDIA" WHERE validity=1" */
+#define SELECT_MEDIA_COUNT_FROM_MEDIA                  "SELECT COUNT(*) FROM (SELECT media_id FROM '%s' WHERE validity=1 "
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_SIMPLE   "SELECT COUNT(*) FROM '%s' WHERE validity=1 "
 #define SELECT_MEDIA_COUNT_FROM_ALBUM                  "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND album_id='%d'"
 #define SELECT_MEDIA_COUNT_FROM_GROUP                  "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP         /*to apply limit condition. */
 #define SELECT_MEDIA_COUNT_FROM_GROUP_NULL             "SELECT COUNT(*) FROM ("SELECT_MEDIA_FROM_GROUP_NULL    /* to apply limit condition. */
 #define SELECT_MEDIA_COUNT_FROM_FOLDER                 "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND folder_id='%s'"
-#define SELECT_MEDIA_COUNT_FROM_STORAGE                        "SELECT COUNT(*) FROM '%s' WHERE validity=1 AND storage_uuid='%s'"
 #define SELECT_MEDIA_COUNT_FROM_TAG                            "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE (tag_id=%d AND tag_media_count>0) "
 #define SELECT_MEDIA_COUNT_FROM_PLAYLIST                       "SELECT COUNT(*) FROM "DB_VIEW_PLAYLIST" WHERE (playlist_id=%d and playlist_media_count>0) "
 
@@ -590,7 +589,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #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_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'"
@@ -602,9 +600,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DELETE_BOOKMARK_FROM_BOOKMARK  "DELETE FROM "DB_TABLE_BOOKMARK" WHERE bookmark_id=%d"
 
 /* Storage*/
-#define SELECT_STORAGE_COUNT                           "SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1"
 #define SELECT_STORAGE_LIST                                    "SELECT storage_id, storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_path FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_id='%s'"
 
 /* Face */
 #define DELETE_FACE_FROM_FACE                  "DELETE FROM "DB_TABLE_FACE" WHERE media_face_id=%d"

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index fd762cd..efbe6a2 100644 (file)
--- a/packaging/capi-content-media-content.spec
+++ b/packaging/capi-content-media-content.spec
@@ -1,6 +1,6 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.4.30
+Version:    0.4.31
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0