Remove the queue for the folder insertion

[platform/core/multimedia/libmedia-service.git] / src / common / media-svc.c

diff --git a/src/common/media-svc.c b/src/common/media-svc.c
index b3f508d..4a5078c 100755 (executable)
--- a/src/common/media-svc.c
+++ b/src/common/media-svc.c
@@ -41,9 +41,6 @@ static __thread int g_media_svc_insert_item_cur_data_cnt = 0;
 static __thread int g_media_svc_update_item_data_cnt = 1;
 static __thread int g_media_svc_update_item_cur_data_cnt = 0;
 
-static __thread int g_media_svc_insert_folder_data_cnt = 1;
-static __thread int g_media_svc_insert_folder_cur_data_cnt = 0;
-
 /* Flag for items to be published by notification */
 static __thread int g_insert_with_noti = FALSE;
 
@@ -832,70 +829,14 @@ int media_svc_insert_storage(sqlite3 *handle, const char *storage_id, const char
        return ret;
 }
 
-int media_svc_insert_folder_begin(int data_cnt)
-{
-       media_svc_debug("Transaction data count : [%d]", data_cnt);
-
-       media_svc_retvm_if(data_cnt < 1, MS_MEDIA_ERR_INVALID_PARAMETER, "data_cnt shuld be bigger than 1");
-
-       g_media_svc_insert_folder_data_cnt = data_cnt;
-       g_media_svc_insert_folder_cur_data_cnt = 0;
-
-       return MS_MEDIA_ERR_NONE;
-}
-
-int media_svc_insert_folder_end(uid_t uid)
-{
-       int ret = MS_MEDIA_ERR_NONE;
-
-       media_svc_debug_fenter();
-
-       if (g_media_svc_insert_folder_cur_data_cnt > 0)
-               ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
-
-       g_media_svc_insert_folder_data_cnt = 1;
-       g_media_svc_insert_folder_cur_data_cnt = 0;
-
-       return ret;
-}
-
 int media_svc_insert_folder(sqlite3 *handle, const char *storage_id, ms_user_storage_type_e storage_type, const char *path, uid_t uid)
 {
-       int ret = MS_MEDIA_ERR_NONE;
-       char folder_uuid[MEDIA_SVC_UUID_SIZE+1] = {0,};
-
        media_svc_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Handle is NULL");
        media_svc_retvm_if(!STRING_VALID(storage_id), MS_MEDIA_ERR_INVALID_PARAMETER, "storage_id is NULL");
        media_svc_retvm_if(!STRING_VALID(path), MS_MEDIA_ERR_INVALID_PARAMETER, "path is NULL");
        media_svc_retvm_if(_media_svc_check_storage_type(storage_type) != TRUE, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid storage_type");
 
-       if (g_media_svc_insert_folder_data_cnt == 1) {
-
-               ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, FALSE, uid);
-
-       } else if (g_media_svc_insert_folder_cur_data_cnt < (g_media_svc_insert_folder_data_cnt - 1)) {
-
-               ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, TRUE, uid);
-               media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-               g_media_svc_insert_folder_cur_data_cnt++;
-
-       } else if (g_media_svc_insert_folder_cur_data_cnt == (g_media_svc_insert_folder_data_cnt - 1)) {
-
-               ret = _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, folder_uuid, TRUE, uid);
-               media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-               ret = _media_svc_list_query_do(MEDIA_SVC_QUERY_INSERT_FOLDER, uid);
-               media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-
-               g_media_svc_insert_folder_cur_data_cnt = 0;
-
-       } else {
-               media_svc_error("Error in media_svc_set_insert_folder");
-               return MS_MEDIA_ERR_INTERNAL;
-       }
-
-       return ret;
+       return _media_svc_get_and_append_folder_id_by_folder_path(handle, storage_id, path, storage_type, uid);
 }
 
 int media_svc_set_folder_validity(sqlite3 *handle, const char *storage_id, const char *start_path, int validity, bool is_recursive, uid_t uid)