Fix folder query for filter keyword

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

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index 451a866..9ac3e62 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -654,7 +654,7 @@ int _media_svc_init_table_query(const char *event_table_name)
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "name", MEDIA_SVC_DB_TYPE_TEXT, "NOT NULL", USER_V2, NULL, false, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "modified_time", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V2, NULL, false, false, false);
+       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "folder_modified_time", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V2, NULL, false, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_FOLDER], "name_pinyin", MEDIA_SVC_DB_TYPE_TEXT, NULL, USER_V2, NULL, false, false, false);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);

diff --git a/src/common/media-svc-media-folder.c b/src/common/media-svc-media-folder.c
index b268ee6..584a45e 100755 (executable)
--- a/src/common/media-svc-media-folder.c
+++ b/src/common/media-svc-media-folder.c
@@ -96,7 +96,7 @@ static int __media_svc_append_folder(const char *storage_id, ms_user_storage_typ
                _media_svc_get_pinyin_str(folder_name, &folder_name_pinyin);
        /* Sometime SQLITE3 returns NO_RECORD, so need to consider conflict case.. */
        media_svc_debug("UNIQUE:path[%s], storage_uuid[%s]", folder_path, storage_id);
-       char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_uuid, folder_path, name, storage_uuid, storage_type, modified_time, name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ",
+       char *sql = sqlite3_mprintf("INSERT OR IGNORE INTO %q (folder_uuid, folder_path, name, storage_uuid, storage_type, folder_modified_time, name_pinyin) values (%Q, %Q, %Q, %Q, '%d', '%d', %Q); ",
                                MEDIA_SVC_DB_TABLE_FOLDER, folder_id, folder_path, folder_name, storage_id, storage_type, folder_modified_date, folder_name_pinyin);
 
        if (!stack_query) {
@@ -119,7 +119,7 @@ int _media_svc_update_folder_modified_time_by_folder_uuid(const char *folder_uui
 
        modified_time = _media_svc_get_file_time(folder_path);
 
-       char *sql = sqlite3_mprintf("UPDATE %q SET modified_time=%d WHERE folder_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, modified_time, folder_uuid);
+       char *sql = sqlite3_mprintf("UPDATE %q SET folder_modified_time=%d WHERE folder_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, modified_time, folder_uuid);
 
        ret = _media_svc_sql_query(sql, uid);
        SQLITE3_SAFE_FREE(sql);