Match columns of storage with filter keyword

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 03469c3..2868b79 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -429,9 +429,6 @@ typedef struct _media_content_cb_data {
 #define DB_FIELD_FOLDER_STORAGE_TYPE   "storage_type"
 #define DB_FIELD_FOLDER_NAME_PINYIN    "name_pinyin"
 
-/* DB field for Storage*/
-#define DB_FIELD_STORAGE_ID                    "storage_uuid"
-
 /* DB Query Keyword */
 #define QUERY_KEYWORD_AND "AND"
 #define QUERY_KEYWORD_OR "OR"
@@ -544,8 +541,8 @@ typedef struct _media_content_cb_data {
 
 /* Storage*/
 #define SELECT_STORAGE_COUNT                           "SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_LIST                                    "SELECT storage_uuid, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_uuid, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_uuid='%s'"
+#define SELECT_STORAGE_LIST                                    "SELECT storage_id, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1"
+#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_path, storage_type 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/include_product/media_info_private.h b/include_product/media_info_private.h
index 9b00866..02b4527 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -542,9 +542,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_FOLDER_STORAGE_TYPE   "storage_type"
 #define DB_FIELD_FOLDER_NAME_PINYIN    "name_pinyin"
 
-/* DB field for Storage*/
-#define DB_FIELD_STORAGE_ID                    "storage_uuid"
-
 /* DB field for PVR*/
 #define DB_FIELD_PVR_DURATION                                  "duration"
 #define DB_FIELD_PVR_TIME_ZONE                                 "timezone"
@@ -721,8 +718,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 
 /* Storage*/
 #define SELECT_STORAGE_COUNT                           "SELECT COUNT(*) FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_LIST                                    "SELECT storage_uuid, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1"
-#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_uuid, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1 AND storage_uuid='%s'"
+#define SELECT_STORAGE_LIST                                    "SELECT storage_id, storage_path, storage_type FROM "DB_TABLE_STORAGE" WHERE validity=1"
+#define SELECT_STORAGE_INFO_FROM_STORAGE       "SELECT storage_path, storage_type 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"
@@ -737,7 +734,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #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_VALID_STORAGE_FROM_PVR  "WHERE storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1)"
+#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'"
@@ -761,7 +758,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_PVR_GROUP_AND_COUNT_BY_STORAGE_ID               "SELECT %s, COUNT(*) FROM "DB_TABLE_PVR" WHERE storage_uuid='%s'"
 #define SELECT_PVR_GROUP_AND_COUNT                                             "SELECT %s, COUNT(*) FROM "DB_TABLE_PVR" "SELECT_VALID_STORAGE_FROM_PVR
 
-#define SELECT_VALID_STORAGE_FROM_UHD  "WHERE storage_uuid IN (SELECT storage_uuid FROM "DB_TABLE_STORAGE" WHERE validity=1)"
+#define SELECT_VALID_STORAGE_FROM_UHD  "WHERE storage_id IN (SELECT storage_id FROM "DB_TABLE_STORAGE" WHERE validity=1)"
 #define SELECT_UHD_GROUP_LIST                                          "SELECT DISTINCT %s FROM "DB_TABLE_UHD" "SELECT_VALID_STORAGE_FROM_UHD
 #define SELECT_UHD_GROUP_LIST_BY_STORAGE_ID            "SELECT DISTINCT %s FROM "DB_TABLE_UHD" WHERE storage_uuid='%s'"
 #define SELECT_UHD_GROUP_COUNT                                 "SELECT COUNT(*) FROM ("SELECT_UHD_GROUP_LIST

diff --git a/src/media_content.c b/src/media_content.c
index c222a62..3456f35 100755 (executable)
--- a/src/media_content.c
+++ b/src/media_content.c
@@ -25,14 +25,13 @@ static int ref_count = 0;
 static GMutex db_mutex;
 static uid_t content_g_uid = 0;
 
-static int __media_content_create_attribute_handles(void);
-static int __media_content_destroy_attribute_handle(void);
-
 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},
@@ -90,9 +89,6 @@ static media_content_attribute_info_s g_content_attrs_info[] = {
        {FOLDER_STORAGE_TYPE,                   DB_FIELD_FOLDER_STORAGE_TYPE},
        {FOLDER_NAME_PINYIN,                    DB_FIELD_FOLDER_NAME_PINYIN},
 
-       /* Storage */
-       {MEDIA_STORAGE_ID,                              DB_FIELD_STORAGE_ID},
-
 #ifdef _USE_SENIOR_MODE
        {MEDIA_CONTACT,                         DB_FIELD_MEDIA_CONTACT},
        {MEDIA_APP_DATA,                                DB_FIELD_MEDIA_APP_DATA},

diff --git a/src/media_storage.c b/src/media_storage.c
index c569bf3..2b44ca6 100755 (executable)
--- a/src/media_storage.c
+++ b/src/media_storage.c
@@ -45,9 +45,9 @@ int media_storage_get_storage_info_from_db(const char *storage_id, media_storage
                        return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
                }
 
-               _storage->storage_id = g_strdup((const char *)sqlite3_column_text(stmt, 0));
-               _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 1));
-               _storage->storage_type = (int)sqlite3_column_int(stmt, 2);
+               _storage->storage_id = g_strdup(storage_id);
+               _storage->storage_path = g_strdup((const char *)sqlite3_column_text(stmt, 0));
+               _storage->storage_type = (int)sqlite3_column_int(stmt, 1);
 
                *storage = (media_storage_h)_storage;
        } else {