Remove useless mmc mount check code

Change-Id: Ib8f33ede5b8fbbe62f3085d77d15710b6c1d58ff

diff --git a/include/dcm_svc_db.h b/include/dcm_svc_db.h
index ef6bf02eda5b349bc64d2d44f5acfaa7f833b9a3..83c4e32f9117185a5d2aa256d5029624461bf0fc 100755 (executable)
--- a/include/dcm_svc_db.h
+++ b/include/dcm_svc_db.h
@@ -30,9 +30,7 @@
 #define DB_TABLE_MEDIA "media"
 #define FACE_ITEM "face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w , face_rect_h, orientation"
 
-#define SELECT_PATH_FROM_UNEXTRACTED_DCM_MEDIA "SELECT media_uuid, path, storage_uuid, width, height, orientation, mime_type FROM media WHERE media_uuid NOT IN (SELECT DISTINCT media_uuid FROM face_scan_list) AND validity=1 AND media_type=0 AND (storage_type = 0 OR storage_type = 1);"
-#define SELECT_PATH_FROM_UNEXTRACTED_DCM_INTERNAL_MEDIA "SELECT media_uuid, path, storage_uuid, width, height, orientation, mime_type FROM media WHERE media_uuid NOT IN (SELECT DISTINCT media_uuid FROM face_scan_list) AND validity=1 AND media_type=0 AND storage_type=0;"
-
+#define SELECT_PATH_FROM_UNEXTRACTED_DCM_MEDIA "SELECT media_uuid, path, storage_uuid, width, height, orientation, mime_type FROM media WHERE media_uuid NOT IN (SELECT DISTINCT media_uuid FROM face_scan_list) AND validity=1 AND media_type=0;"
 #define SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB "SELECT media_uuid, storage_uuid, width, height, orientation, mime_type, modified_time FROM media WHERE path = '%q';"
 #define SELECT_SCAN_INFO_BY_MEDIA_ID "SELECT modified_time FROM "DB_TABLE_FACE_SCAN_LIST" WHERE media_uuid = '%q';"
 
@@ -58,15 +56,15 @@ typedef struct {
 
 typedef enum {
        FACE_SCAN_NEEDED        = 0,
-       FACE_SCAN_NO_NEEDED     = 2,
-       FACE_SCAN_REFRESH_NEEDED        = 1,
+       FACE_SCAN_NO_NEEDED     = 1,
+       FACE_SCAN_REFRESH_NEEDED        = 2,
        FACE_SCAN_STATUS_NONE = 3,
 } dcm_face_scan_status_e;
 
 int dcm_svc_db_connect(uid_t uid);
 int dcm_svc_db_disconnect();
-int dcm_svc_db_get_scan_image_list_by_path(GList **image_list, gboolean mmc_mounted, const char *file_path);
-int dcm_svc_db_get_scan_image_list_from_db(GList **image_list, gboolean mmc_mounted);
+int dcm_svc_db_get_scan_image_list_by_path(GList **image_list, const char *file_path);
+int dcm_svc_db_get_scan_image_list_from_db(GList **image_list);
 int dcm_svc_db_insert_category_to_db(void *item);
 int dcm_svc_db_generate_uuid(dcm_face_item_s **face);
 int dcm_svc_db_insert_face_to_db(dcm_face_item_s *face);

diff --git a/src/dcm_svc_db.c b/src/dcm_svc_db.c
index f203bc1f58d572ceca26fd8a3b8cbb5a0f9891a8..9883da36086e046249b796c40274435385bc7d22 100755 (executable)
--- a/src/dcm_svc_db.c
+++ b/src/dcm_svc_db.c
@@ -204,7 +204,7 @@ int dcm_svc_db_disconnect(void)
 }
 
 
-int dcm_svc_db_get_scan_image_list_by_path(GList **image_list, gboolean mmc_mounted, const char *file_path)
+int dcm_svc_db_get_scan_image_list_by_path(GList **image_list, const char *file_path)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char *query_string = NULL;
@@ -216,11 +216,7 @@ int dcm_svc_db_get_scan_image_list_by_path(GList **image_list, gboolean mmc_moun
        DCM_CHECK_VAL(file_path, MS_MEDIA_ERR_INVALID_PARAMETER);
 
        /* Make query */
-       if (mmc_mounted == true)
-               query_string = sqlite3_mprintf(SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB, file_path);
-       else
-               query_string = sqlite3_mprintf(SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB, file_path);
-
+       query_string = sqlite3_mprintf(SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB, file_path);
        DCM_CHECK_VAL(query_string, MS_MEDIA_ERR_OUT_OF_MEMORY);
 
        ret = __dcm_svc_sql_prepare_to_step_simple((sqlite3 *)db_handle, query_string, &sql_stmt);
@@ -266,7 +262,7 @@ int dcm_svc_db_get_scan_image_list_by_path(GList **image_list, gboolean mmc_moun
        return ret;
 }
 
-int dcm_svc_db_get_scan_image_list_from_db(GList **image_list, gboolean mmc_mounted)
+int dcm_svc_db_get_scan_image_list_from_db(GList **image_list)
 {
        int ret = MS_MEDIA_ERR_NONE;
        char * query_string = NULL;
@@ -278,10 +274,8 @@ int dcm_svc_db_get_scan_image_list_from_db(GList **image_list, gboolean mmc_moun
        DCM_CHECK_VAL(image_list, MS_MEDIA_ERR_INVALID_PARAMETER);
 
        /* Make query */
-       if (mmc_mounted == true)
-               query_string = sqlite3_mprintf(SELECT_PATH_FROM_UNEXTRACTED_DCM_MEDIA);
-       else
-               query_string = sqlite3_mprintf(SELECT_PATH_FROM_UNEXTRACTED_DCM_INTERNAL_MEDIA);
+       query_string = sqlite3_mprintf(SELECT_PATH_FROM_UNEXTRACTED_DCM_MEDIA);
+       DCM_CHECK_VAL(query_string, MS_MEDIA_ERR_OUT_OF_MEMORY);
 
        ret = __dcm_svc_sql_prepare_to_step_simple((sqlite3 *)db_handle, query_string, &sql_stmt);
        if (ret != MS_MEDIA_ERR_NONE) {

diff --git a/src/dcm_svc_internal.c b/src/dcm_svc_internal.c
index 97b7752fd534b50fb090895a92a876c45f449d53..2cb38e6fb0e6df4ab6fbc06c8a78c625622c5f7e 100755 (executable)
--- a/src/dcm_svc_internal.c
+++ b/src/dcm_svc_internal.c
@@ -118,30 +118,12 @@ static void __destroy_scan_item(void *data)
        return;
 }
 
-static int __dcm_scan_get_mmc_state(void)
-{
-       int err = -1;
-       int status = -1;
-
-       err = vconf_get_int(VCONFKEY_SYSMAN_MMC_STATUS, &status);
-       if (err != 0)
-               dcm_error("vconf_get_int Unexpected error code: %d", err);
-
-       return status;
-}
-
 static int __dcm_scan_get_item_list(dcm_scan_s *data)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       gboolean mmc_mounted = false;
-
-       if (__dcm_scan_get_mmc_state() == VCONFKEY_SYSMAN_MMC_MOUNTED)
-               mmc_mounted = true;
-       else
-               mmc_mounted = false;
 
        /* Get scan image list from db */
-       ret = dcm_svc_db_get_scan_image_list_from_db(&(data->scan_all_item_list), mmc_mounted);
+       ret = dcm_svc_db_get_scan_image_list_from_db(&(data->scan_all_item_list));
        if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("Failed to get image list from db! ret: %d", ret);
                return ret;
@@ -163,15 +145,9 @@ static int __dcm_scan_get_item_list(dcm_scan_s *data)
 static int __dcm_scan_get_item_list_by_path(const char *file_path, dcm_scan_s *data)
 {
        int ret = MS_MEDIA_ERR_NONE;
-       gboolean mmc_mounted = false;
-
-       if (__dcm_scan_get_mmc_state() == VCONFKEY_SYSMAN_MMC_MOUNTED)
-               mmc_mounted = true;
-       else
-               mmc_mounted = false;
 
        /* Get scan image list from db */
-       ret = dcm_svc_db_get_scan_image_list_by_path(&(data->scan_single_item_list), mmc_mounted, file_path);
+       ret = dcm_svc_db_get_scan_image_list_by_path(&(data->scan_single_item_list), file_path);
        if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("Failed to get image list from db! ret: %d", ret);
                return ret;