Modify Error type.

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

diff --git a/src/media_content.c b/src/media_content.c
index 297a3286c53c9423e525ada58c8d34d9e7084544..1ec1ab57d214ee10c82dbff7776b542853fb65aa 100755 (executable)
--- a/src/media_content.c
+++ b/src/media_content.c
@@ -15,7 +15,6 @@
 */
 
 
-#include <media-thumb-error.h>
 #include <media_info_private.h>
 #include <media-util.h>
 
@@ -603,53 +602,44 @@ int _content_query_prepare(sqlite3_stmt **stmt, char *select_query, char *condit
 
 int _content_error_capi(int type, int content_error)
 {
-       media_content_debug("[type : %d] content_error : %d ", type, content_error);
-
-       if(type == MEDIA_CONTENT_TYPE)
+       if(content_error != MEDIA_CONTENT_ERROR_NONE)
        {
-               if(content_error == MEDIA_INFO_ERROR_NONE)
-                       return MEDIA_CONTENT_ERROR_NONE;
-               else if(content_error == MEDIA_INFO_ERROR_INVALID_PARAMETER)
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               else if((content_error == MEDIA_INFO_ERROR_DATABASE_CONNECT) || (content_error == MEDIA_INFO_ERROR_DATABASE_DISCONNECT) ||
-                               (content_error == MEDIA_INFO_ERROR_DATABASE_NO_RECORD) ||(content_error == MEDIA_INFO_ERROR_DATABASE_INTERNAL))
-                       return MEDIA_CONTENT_ERROR_DB_FAILED;
-               else if((content_error == MS_MEDIA_ERR_SOCKET_CONN) ||(content_error == MS_MEDIA_ERR_SOCKET_INTERNAL) ||
-                               (content_error == MS_MEDIA_ERR_SOCKET_SEND) ||(content_error == MS_MEDIA_ERR_SOCKET_RECEIVE) || (content_error == MS_MEDIA_ERR_SOCKET_RECEIVE_TIMEOUT))
-                       return MEDIA_CONTENT_ERROR_NETWORK;
-       } else if(type == MEDIA_THUMBNAIL_TYPE) {
-               if(content_error == MEDIA_THUMB_ERROR_NONE)
-                       return MEDIA_CONTENT_ERROR_NONE;
-               else if(content_error == MEDIA_THUMB_ERROR_INVALID_PARAMETER || content_error == MEDIA_THUMB_ERROR_DUPLICATED_REQUEST)
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               else if(content_error == MEDIA_THUMB_ERROR_DB)
-                       return MEDIA_CONTENT_ERROR_DB_FAILED;
-               else if(content_error == MEDIA_THUMB_ERROR_NETWORK)
-                       return MEDIA_CONTENT_ERROR_NETWORK;
-               else if(content_error == MEDIA_THUMB_ERROR_TIMEOUT)
-                       return MEDIA_CONTENT_ERROR_NETWORK;
-               else if(content_error == MEDIA_THUMB_ERROR_MM_UTIL)                     /* Error in mm-util lib */
-                       return MEDIA_CONTENT_ERROR_INVALID_OPERATION;
-               else if(content_error == MEDIA_THUMB_ERROR_HASHCODE)            /* Failed to generate hash code */
-                       return MEDIA_CONTENT_ERROR_INVALID_OPERATION;
-               else if(content_error == MEDIA_THUMB_ERROR_TOO_BIG)                     /* Original is too big to make thumb */
-                       return MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT;
-               else if(content_error == MEDIA_THUMB_ERROR_UNSUPPORTED) /* Unsupported type */
-                       return MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT;
-
-       } else if(type == MEDIA_REGISTER_TYPE) {
-               if(content_error == MS_MEDIA_ERR_NONE)
-                       return MEDIA_CONTENT_ERROR_NONE;
-               else if(content_error == MS_MEDIA_ERR_INVALID_PARAMETER || content_error == MS_MEDIA_ERR_INVALID_PATH)
-                       return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
-               else if(content_error == MS_MEDIA_ERR_DB_INSERT_FAIL)
-                       return MEDIA_CONTENT_ERROR_DB_FAILED;
-               else if(content_error == MS_MEDIA_ERR_INTERNAL)
-                       return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
-               else if(content_error == MS_MEDIA_ERR_VCONF_GET_FAIL)
-                       return MEDIA_CONTENT_ERROR_INVALID_OPERATION;
+               media_content_error("[type : %d] content_error : %d ", type, content_error);
        }
 
+       /*Error None*/
+       if(content_error == MS_MEDIA_ERR_NONE)
+               return MEDIA_CONTENT_ERROR_NONE;
+
+       /* Internal operation error*/
+       else if((content_error == MS_MEDIA_ERR_INVALID_PARAMETER) ||
+               (content_error == MS_MEDIA_ERR_INVALID_PATH) ||
+               (content_error == MS_MEDIA_ERR_THUMB_DUPLICATED_REQUEST))
+               return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
+
+       else if(content_error == MS_MEDIA_ERR_OUT_OF_MEMORY)
+               return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
+
+       /* DB operation error*/
+       else if(content_error == MS_MEDIA_ERR_DB_BUSY_FAIL)
+               return MEDIA_CONTENT_ERROR_DB_BUSY;
+
+       else if((content_error <= MS_MEDIA_ERR_DB_CONNECT_FAIL) && (content_error >= MS_MEDIA_ERR_DB_INTERNAL))
+               return MEDIA_CONTENT_ERROR_DB_FAILED;
+
+       /* IPC operation error*/
+       else if((content_error <= MS_MEDIA_ERR_SOCKET_CONN) && (content_error >= MS_MEDIA_ERR_SOCKET_INTERNAL))
+               return MEDIA_CONTENT_ERROR_NETWORK;
+
+       /* MEDIA SERVER error*/
+       else if(content_error == MS_MEDIA_ERR_PERMISSION_DENIED)
+               return MEDIA_CONTENT_ERROR_PERMISSION_DENIED;
+
+       /* Thumbnail error*/
+       else if(content_error == MS_MEDIA_ERR_THUMB_TOO_BIG)
+                       return MEDIA_CONTENT_ERROR_UNSUPPORTED_CONTENT;
+
+       /*ETC*/
        return MEDIA_CONTENT_ERROR_INVALID_OPERATION;
 }
 
@@ -769,7 +759,7 @@ int media_content_scan_file(const char *path)
                        }
 
                        ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), path);
-                       if (ret == MEDIA_INFO_ERROR_NONE) {
+                       if (ret == MS_MEDIA_ERR_NONE) {
                                /* Refresh */
                                ret = media_svc_refresh_item(_content_get_db_handle(), storage_type, path, tzplatform_getuid(TZ_USER_NAME));
                                if (ret < 0) {
@@ -777,7 +767,7 @@ int media_content_scan_file(const char *path)
                                        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
                                }
 
-                       } else if (ret == MEDIA_INFO_ERROR_DATABASE_NO_RECORD) {
+                       } else if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
                                /* Insert */
                                ret = media_svc_insert_item_immediately(_content_get_db_handle(), storage_type, path, tzplatform_getuid(TZ_USER_NAME));
                                if (ret < 0) {

diff --git a/src/media_info.c b/src/media_info.c
index 4df2b4837c6a67a0b3585ab89cbfd0ad45496b07..4ec51e9b0d692480ed1091fd8c1aaa8e3195b7ce 100755 (executable)
--- a/src/media_info.c
+++ b/src/media_info.c
@@ -466,7 +466,7 @@ int media_info_insert_to_db (const char *path, media_info_h *info)
        }
 
        ret = media_svc_check_item_exist_by_path(_content_get_db_handle(), _path);
-       if (ret == MEDIA_INFO_ERROR_DATABASE_NO_RECORD) {
+       if (ret == MS_MEDIA_ERR_DB_NO_RECORD) {
                media_content_debug("media_svc_check_item_exist_by_path : no record : %s", _path);
 
                media_svc_storage_type_e storage_type;
@@ -486,7 +486,7 @@ int media_info_insert_to_db (const char *path, media_info_h *info)
                        SAFE_FREE(_path);
                        return _content_error_capi(MEDIA_CONTENT_TYPE, ret);
                }
-       } else if (ret != MEDIA_INFO_ERROR_NONE) {
+       } else if (ret != MS_MEDIA_ERR_NONE) {
                media_content_error("media_svc_check_item_exist_by_path failed : %d (%s)", ret, _path);
                SAFE_FREE(_path);
                return _content_error_capi(MEDIA_CONTENT_TYPE, ret);

diff --git a/src/media_util_private.c b/src/media_util_private.c
index 9892dbe2282e8fa7f2c0440ec6d4fb92c2e9b8ee..0d3716f2fa6429eae1d72f4f1c45a7119a699968 100755 (executable)
--- a/src/media_util_private.c
+++ b/src/media_util_private.c
@@ -70,7 +70,7 @@ int _media_util_check_ignore_dir(const char *dir_path, bool *ignore)
 
        /*2. Check Scan Ignore Directory*/
        ret = media_svc_get_storage_type(dir_path, &storage_type);
-       if(ret != MEDIA_INFO_ERROR_NONE)
+       if(ret != MS_MEDIA_ERR_NONE)
        {
                media_content_error("media_svc_get_storage_type failed : %d", ret);
                return _content_error_capi(MEDIA_CONTENT_TYPE, ret);