Remove sync_status

Remove 'sync_status' that is MCD commercial column
"sync_status" was used to indicate whether the content information between mobile and wearable has been synced.

Change-Id: Ied19046667a41ee388dc3a15ff11c4004f53b221
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 d7696e2..b58909d 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -526,8 +526,6 @@ 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_MEDIA], "media_timeline", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V2, NULL, false, false, true);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
-       ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_MEDIA], "sync_status", MEDIA_SVC_DB_TYPE_INT, "DEFAULT 0", USER_V2, NULL, false, false, true);
-       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
        ret = __media_svc_add_column_info(&column_list[MEDIA_SVC_DB_LIST_MEDIA], "media_file_name_pinyin", MEDIA_SVC_DB_TYPE_TEXT, 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_MEDIA], "media_title_pinyin", MEDIA_SVC_DB_TYPE_TEXT, NULL, USER_V2, NULL, false, false, false);

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 3092b0d..55c379d 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -80,11 +80,11 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
        const char *db_fields = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, \
                media_title, album_id, media_album, media_artist, media_album_artist, media_genre, media_composer, media_year, media_recorded_date, media_copyright, media_track_num, media_description, \
                media_favourite, media_bitrate, media_bitpersample, media_samplerate, media_channel, media_duration, \
-               media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_is_drm, media_storage_type, media_timeline, sync_status, \
+               media_longitude, media_latitude, media_altitude, exposure_time, fnumber, iso, model, media_width, media_height, media_datetaken, media_orientation, media_rating, media_is_drm, media_storage_type, media_timeline, \
                media_file_name_pinyin, media_title_pinyin, media_album_pinyin, media_artist_pinyin, media_album_artist_pinyin, media_genre_pinyin, media_composer_pinyin, media_copyright_pinyin, media_description_pinyin, storage_uuid, media_360";
 
        const char *db_fields_basic = "media_id, media_path, media_display_name, media_type, media_mime_type, media_size, media_added_time, media_modified_time, folder_id, media_thumbnail_path, \
-               album_id, media_favourite, media_is_drm, media_storage_type, media_timeline, sync_status, media_file_name_pinyin, storage_uuid, media_360";
+               album_id, media_favourite, media_is_drm, media_storage_type, media_timeline, media_file_name_pinyin, storage_uuid, media_360";
 
        /* This sql is due to sqlite3_mprintf's wrong operation when using floating point in the text format */
        /* This code will be removed when sqlite3_mprintf works clearly */
@@ -116,7 +116,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
        char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, \
                %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, \
                %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %d, \
-               %d, %d, %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);",
+               %d, %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);",
                                MEDIA_SVC_DB_TABLE_MEDIA, db_fields,
                                content_info->media_uuid,
                                content_info->path,
@@ -161,7 +161,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->is_drm,
                                content_info->storage_type,
                                content_info->timeline,
-                               content_info->sync_status,
                                content_info->file_name_pinyin,
                                content_info->media_meta.title_pinyin,
                                content_info->media_meta.album_pinyin,
@@ -180,7 +179,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                media_svc_debug("Query length is over %d byte.. So, remake query using only basic information..", MEDIA_SVC_QUERY_LEN_MAX - 1);
                SQLITE3_SAFE_FREE(sql);
 
-               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, %Q, %d, %d, %d, %d, %d, %d, %d, %d, %Q, %Q, %d);",
+               sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %Q, %Q, %d, %d, %d, %d, %d, %d, %d, %Q, %Q, %d);",
                                                MEDIA_SVC_DB_TABLE_MEDIA, db_fields_basic,
                                                content_info->media_uuid,
                                                content_info->path,
@@ -197,7 +196,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                                content_info->is_drm,
                                                content_info->storage_type,
                                                content_info->timeline,
-                                               content_info->sync_status,
                                                content_info->file_name_pinyin,
                                                content_info->storage_uuid,
                                                content_info->media_meta.is_360

diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index b364ce3..dde1b9d 100755 (executable)
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -104,7 +104,6 @@ typedef struct {
        char            *thumbnail_path;                                /**< Thumbnail image file path */
        time_t  favourate;                                      /**< time favourate set */
        int             is_drm;                                         /**< is_drm. o or 1 */
-       int             sync_status;                                            /**< sync_status */
        int             storage_type;                                   /**< Storage of media file : internal/external */
        char            *storage_uuid;                                  /**< Unique ID of storage */
        media_svc_content_meta_s        media_meta;     /**< meta data structure for audio files */