1 files changed, 9 insertions, 67 deletions

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index 9ba27cb..2096d63 100755
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -77,44 +77,24 @@ int _media_svc_count_record_with_path(sqlite3 *handle, const char *storage_id, c
 	return MS_MEDIA_ERR_NONE;
 }
 
-int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, media_svc_content_info_s *content_info, int is_burst, bool stack_query, uid_t uid)
+int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, media_svc_content_info_s *content_info, bool stack_query, uid_t uid)
 {
 	int ret = MS_MEDIA_ERR_NONE;
-	char *burst_id = NULL;
 
 	const char *db_fields = "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, folder_uuid, thumbnail_path, \
-		title, album_id, album, artist, album_artist, genre, composer, year, recorded_date, copyright, track_num, description, category, keyword, location_tag, \
-		content_name, age_rating, author, provider, last_played_time, played_count, favourite, bitrate, bitpersample, samplerate, channel, duration, \
-		longitude, latitude, altitude, exposure_time, fnumber, iso, model, width, height, datetaken, orientation, rating, is_drm, storage_type, burst_id, timeline, weather, sync_status, \
+		title, album_id, album, artist, album_artist, genre, composer, year, recorded_date, copyright, track_num, description, \
+		favourite, bitrate, bitpersample, samplerate, channel, duration, \
+		longitude, latitude, altitude, exposure_time, fnumber, iso, model, width, height, datetaken, orientation, rating, is_drm, storage_type, timeline, sync_status, \
 		file_name_pinyin, title_pinyin, album_pinyin, artist_pinyin, album_artist_pinyin, genre_pinyin, composer_pinyin, copyright_pinyin, description_pinyin, storage_uuid, is_360";
 
 	const char *db_fields_basic = "media_uuid, path, file_name, media_type, mime_type, size, added_time, modified_time, folder_uuid, thumbnail_path, \
-		album_id, last_played_time, played_count, favourite, is_drm, storage_type, burst_id, timeline, sync_status, file_name_pinyin, storage_uuid, is_360";
+		album_id, favourite, is_drm, storage_type, timeline, sync_status, file_name_pinyin, storage_uuid, is_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 */
 	char *test_sql = sqlite3_mprintf("%f, %f, %f", content_info->media_meta.longitude, content_info->media_meta.latitude, content_info->media_meta.altitude);
 	SQLITE3_SAFE_FREE(test_sql);
 
-	if (is_burst) {
-		int burst_id_int = 0;
-		ret = _media_svc_get_burst_id(handle, storage_id, &burst_id_int);
-		if (ret != MS_MEDIA_ERR_NONE)
-			burst_id = NULL;
-
-		if (burst_id_int > 0) {
-			media_svc_debug("Burst id : %d", burst_id_int);
-			burst_id = sqlite3_mprintf("%d", burst_id_int);
-		}
-
-		/* Get thumbnail for burst shot */
-		char thumb_path[MEDIA_SVC_PATHNAME_SIZE + 1] = {0, };
-
-		ret = _media_svc_create_thumbnail(content_info->path, thumb_path, sizeof(thumb_path), content_info->media_type, uid);
-		if (ret == MS_MEDIA_ERR_NONE)
-			content_info->thumbnail_path = g_strdup(thumb_path);
-	}
-
 	/*Update Pinyin If Support Pinyin*/
 	if (_media_svc_check_pinyin_support()) {
 		if (STRING_VALID(content_info->file_name))
@@ -138,9 +118,9 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
 	}
 
 	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, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d, %d, %d, \
+		%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, %Q, %d, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);",
+		%d, %d, %d, %d, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %d);",
 				content_info->storage_uuid, db_fields,
 				content_info->media_uuid,
 				content_info->path,
@@ -164,15 +144,6 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
 				content_info->media_meta.copyright,
 				content_info->media_meta.track_num,
 				content_info->media_meta.description,
-				content_info->media_meta.category,
-				content_info->media_meta.keyword,
-				content_info->media_meta.location_tag,
-				content_info->media_meta.content_name,
-				content_info->media_meta.age_rating,
-				content_info->media_meta.author,
-				content_info->media_meta.provider,
-				content_info->last_played_time,
-				content_info->played_count,
 				content_info->favourate,		/* 2nd line */
 				content_info->media_meta.bitrate,
 				content_info->media_meta.bitpersample,
@@ -193,9 +164,7 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
 				content_info->media_meta.rating,
 				content_info->is_drm,
 				content_info->storage_type,
-				burst_id,
 				content_info->timeline,
-				content_info->media_meta.weather,
 				content_info->sync_status,
 				content_info->file_name_pinyin,
 				content_info->media_meta.title_pinyin,
@@ -215,7 +184,7 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
 		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, %Q, %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, %d, %Q, %Q, %d);",
 						content_info->storage_uuid, db_fields_basic,
 						content_info->media_uuid,
 						content_info->path,
@@ -228,12 +197,9 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
 						content_info->folder_uuid,
 						content_info->thumbnail_path,
 						content_info->album_id,
-						content_info->last_played_time,
-						content_info->played_count,
 						content_info->favourate,
 						content_info->is_drm,
 						content_info->storage_type,
-						burst_id,
 						content_info->timeline,
 						content_info->sync_status,
 						content_info->file_name_pinyin,
@@ -242,8 +208,6 @@ int _media_svc_insert_item_with_data(sqlite3 *handle, const char *storage_id, me
 						);
 	}
 
-	SQLITE3_SAFE_FREE(burst_id);
-
 	if (!stack_query) {
 		ret = _media_svc_sql_query(sql, uid);
 		SQLITE3_SAFE_FREE(sql);
@@ -606,7 +570,6 @@ int _media_svc_update_recursive_folder_item_validity(const char *storage_id, con
 int _media_svc_update_item_by_path(const char *org_storage_id, const char *src_path, const char *dst_storage_id, media_svc_storage_type_e dest_storage, const char *dest_path, const char *file_name, int modified_time, const char *folder_uuid, uid_t uid)
 {
 	/* update path, filename, modified_time, folder_uuid, thumbnail_path, */
-	/* played_count, last_played_time, last_played_position, favourite, storaget_type*/
 
 	/* NOTICE (This operation is abnormal. Modifications should be cautious.)
 	1. Update source to destination info
@@ -614,7 +577,7 @@ int _media_svc_update_item_by_path(const char *org_storage_id, const char *src_p
 	3. Remove source info
 	*/
 	int ret = MS_MEDIA_ERR_NONE;
-	char *update = sqlite3_mprintf("UPDATE '%q' SET path=%Q, file_name=%Q, modified_time=%d, folder_uuid=%Q, storage_type=%d, storage_uuid='%q', played_count=0, last_played_time=0, last_played_position=0 WHERE path=%Q;",
+	char *update = sqlite3_mprintf("UPDATE '%q' SET path=%Q, file_name=%Q, modified_time=%d, folder_uuid=%Q, storage_type=%d, storage_uuid='%q' WHERE path=%Q;",
 				org_storage_id, dest_path, file_name, modified_time, folder_uuid, dest_storage, dst_storage_id, src_path);
 	char *insert = sqlite3_mprintf("INSERT OR REPLACE INTO '%q' SELECT * FROM '%q' WHERE path = '%q';", dst_storage_id, org_storage_id, dest_path);
 	char *remove = sqlite3_mprintf("DELETE FROM '%q' WHERE path = '%q';", org_storage_id, dest_path);
@@ -681,27 +644,6 @@ int _media_svc_append_query_list(const char *query, uid_t uid)
 	return ret;
 }
 
-int _media_svc_get_burst_id(sqlite3 *handle, const char *storage_id, int *id)
-{
-	int ret = MS_MEDIA_ERR_NONE;
-	int cur_id = -1;
-	sqlite3_stmt *sql_stmt = NULL;
-	char *sql = sqlite3_mprintf("SELECT max(CAST(burst_id AS INTEGER)) FROM '%q'", storage_id);
-
-	ret = _media_svc_sql_prepare_to_step(handle, sql, &sql_stmt);
-
-	if (ret != MS_MEDIA_ERR_NONE) {
-		media_svc_error("error when _media_svc_get_burst_id. err = [%d]", ret);
-		return ret;
-	}
-
-	cur_id = sqlite3_column_int(sql_stmt, 0);
-	*id = ++cur_id;
-	SQLITE3_FINALIZE(sql_stmt);
-
-	return MS_MEDIA_ERR_NONE;
-}
-
 int _media_svc_get_noti_info(sqlite3 *handle, const char *storage_id, const char *path, int update_item, media_svc_noti_item **item)
 {
 	int ret = MS_MEDIA_ERR_NONE;