Remove unused DB fields

Removed unused db fields according to filter keyword deletion.

Refer to [ACR-1735].

Change-Id: I3da03b32f76613571c9a30d9f71b07dcc5ac2613
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 93075f2..bd10d37 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version:    0.4.26
+Version:    0.4.27
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0 and PD

diff --git a/src/common/media-svc-db-utils.c b/src/common/media-svc-db-utils.c
index 4b5e61f..5187b59 100755 (executable)
--- a/src/common/media-svc-db-utils.c
+++ b/src/common/media-svc-db-utils.c
@@ -409,8 +409,6 @@ int _media_svc_init_table_query(void)
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_album_artist_pinyin", DB_TYPE_TEXT, NULL, false, false, false);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_genre_pinyin", DB_TYPE_TEXT, NULL, false, false, false);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_composer_pinyin", DB_TYPE_TEXT, NULL, false, false, false);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_copyright_pinyin", DB_TYPE_TEXT, NULL, false, false, false);
-       __add_column_info(&column_list[DB_LIST_MEDIA], "media_description_pinyin", DB_TYPE_TEXT, NULL, false, false, false);
        __add_column_info(&column_list[DB_LIST_MEDIA], "storage_uuid", DB_TYPE_TEXT, NULL, false, false, true);
        __add_column_info(&column_list[DB_LIST_MEDIA], "validity", DB_TYPE_INT, "DEFAULT 1", false, false, false);
        __add_column_info(&column_list[DB_LIST_MEDIA], "media_360", DB_TYPE_INT, "DEFAULT 0", false, false, true);

diff --git a/src/common/media-svc-media.c b/src/common/media-svc-media.c
index ef0d598..41eb926 100755 (executable)
--- a/src/common/media-svc-media.c
+++ b/src/common/media-svc-media.c
@@ -78,7 +78,7 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                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_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, \
-               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";
+               media_file_name_pinyin, media_title_pinyin, media_album_pinyin, media_artist_pinyin, media_album_artist_pinyin, media_genre_pinyin, media_composer_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_is_drm, media_storage_type, media_timeline, media_file_name_pinyin, storage_uuid, media_360";
@@ -104,16 +104,12 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                        _media_svc_get_pinyin_str(content_info->media_meta.genre, &content_info->media_meta.genre_pinyin);
                if (STRING_VALID(content_info->media_meta.composer))
                        _media_svc_get_pinyin_str(content_info->media_meta.composer, &content_info->media_meta.composer_pinyin);
-               if (STRING_VALID(content_info->media_meta.copyright))
-                       _media_svc_get_pinyin_str(content_info->media_meta.copyright, &content_info->media_meta.copyright_pinyin);
-               if (STRING_VALID(content_info->media_meta.description))
-                       _media_svc_get_pinyin_str(content_info->media_meta.description, &content_info->media_meta.description_pinyin);
        }
 
        char *sql = sqlite3_mprintf("INSERT INTO %q(%q) VALUES (%Q, %Q, %Q, %d, %Q, %lld, %d, %d, %lld, \
                %Q, %Q, %d, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, %Q, \
                %d, %d, %d, %d, %d, %.6f, %.6f, %.6f, %Q, %.6f, %d, %Q, %d, %d, %Q, %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, %d);",
                                DB_TABLE_MEDIA, db_fields,
                                content_info->media_uuid,
                                content_info->path,
@@ -164,8 +160,6 @@ int _media_svc_insert_item_with_data(bool is_direct, media_svc_content_info_s *c
                                content_info->media_meta.album_artist_pinyin,
                                content_info->media_meta.genre_pinyin,
                                content_info->media_meta.composer_pinyin,
-                               content_info->media_meta.copyright_pinyin,
-                               content_info->media_meta.description_pinyin,
                                content_info->storage_uuid,
                                content_info->media_meta.is_360         /* 4th line */
                        );
@@ -256,28 +250,6 @@ int _media_svc_update_item_with_data(bool is_direct, media_svc_content_info_s *c
        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);
 
-       /*Update Pinyin If Support Pinyin*/
-       if (_media_svc_check_pinyin_support()) {
-               if (STRING_VALID(content_info->file_name))
-                       _media_svc_get_pinyin_str(content_info->file_name, &content_info->file_name_pinyin);
-               if (STRING_VALID(content_info->media_meta.title))
-                       _media_svc_get_pinyin_str(content_info->media_meta.title, &content_info->media_meta.title_pinyin);
-               if (STRING_VALID(content_info->media_meta.album))
-                       _media_svc_get_pinyin_str(content_info->media_meta.album, &content_info->media_meta.album_pinyin);
-               if (STRING_VALID(content_info->media_meta.artist))
-                       _media_svc_get_pinyin_str(content_info->media_meta.artist, &content_info->media_meta.artist_pinyin);
-               if (STRING_VALID(content_info->media_meta.album_artist))
-                       _media_svc_get_pinyin_str(content_info->media_meta.album_artist, &content_info->media_meta.album_artist_pinyin);
-               if (STRING_VALID(content_info->media_meta.genre))
-                       _media_svc_get_pinyin_str(content_info->media_meta.genre, &content_info->media_meta.genre_pinyin);
-               if (STRING_VALID(content_info->media_meta.composer))
-                       _media_svc_get_pinyin_str(content_info->media_meta.composer, &content_info->media_meta.composer_pinyin);
-               if (STRING_VALID(content_info->media_meta.copyright))
-                       _media_svc_get_pinyin_str(content_info->media_meta.copyright, &content_info->media_meta.copyright_pinyin);
-               if (STRING_VALID(content_info->media_meta.description))
-                       _media_svc_get_pinyin_str(content_info->media_meta.description, &content_info->media_meta.description_pinyin);
-       }
-
        char *sql = sqlite3_mprintf("UPDATE %q SET media_size=%lld, media_modified_time=%d, media_thumbnail_path=%Q, media_title=%Q, album_id=%d, media_album=%Q, media_artist=%Q, media_album_artist=%Q, media_genre=%Q, \
                media_composer=%Q, media_year=%Q, media_recorded_date=%Q, media_copyright=%Q, media_track_num=%Q, media_description=%Q, media_bitrate=%d, media_bitpersample=%d, media_samplerate=%d, media_channel=%d, media_duration=%d, \
                media_longitude=%f, media_latitude=%f, media_altitude=%f, exposure_time=%Q, fnumber=%f, iso=%d, model=%Q, media_width=%d, media_height=%d, media_datetaken=%Q, media_orientation=%d, validity=1 WHERE media_path=%Q;",
@@ -497,4 +469,4 @@ int _media_svc_get_noti_info(sqlite3 *handle, const char *path, media_svc_noti_i
        SQLITE3_FINALIZE(sql_stmt);
 
        return MS_MEDIA_ERR_NONE;
-}
\ No newline at end of file
+}

diff --git a/src/common/media-svc-util.c b/src/common/media-svc-util.c
index da38a00..5bedf30 100644 (file)
--- a/src/common/media-svc-util.c
+++ b/src/common/media-svc-util.c
@@ -1466,8 +1466,6 @@ void _media_svc_destroy_content_info(media_svc_content_info_s *content_info)
        g_free(content_info->media_meta.album_artist_pinyin);
        g_free(content_info->media_meta.genre_pinyin);
        g_free(content_info->media_meta.composer_pinyin);
-       g_free(content_info->media_meta.copyright_pinyin);
-       g_free(content_info->media_meta.description_pinyin);
 }
 
 int _media_svc_create_thumbnail(const char *path, char *thumb_path, media_svc_media_type_e media_type, uid_t uid)
@@ -1781,4 +1779,4 @@ bool _media_svc_get_matched_list(const char *keyword, uid_t uid, GList **list)
        sqlite3_close_v2(handle);
 
        return true;
-}
\ No newline at end of file
+}

diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index 1eb8adb..efa3ef2 100755 (executable)
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -85,8 +85,6 @@ typedef struct {
        char            *album_artist_pinyin;                   /**< pinyin for album_artist*/
        char            *genre_pinyin;                                  /**< pinyin for genre*/
        char            *composer_pinyin;                               /**< pinyin for composer*/
-       char            *copyright_pinyin;                              /**< pinyin for copyright*/
-       char            *description_pinyin;                    /**< pinyin for description*/
        int             is_360;
 } media_svc_content_meta_s;