Remove face_scan_list table

DCM server is removed.
So face_scan_list table is not used.

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

diff --git a/include/media-svc-env.h b/include/media-svc-env.h
index e8693d97d16c0e06ba388e6259ecc284b8a0ed8d..6ed62879ae100fe0f5147efad9c21e57131c50fd 100644 (file)
--- a/include/media-svc-env.h
+++ b/include/media-svc-env.h
@@ -43,7 +43,6 @@ extern "C" {
 #define DB_TABLE_BOOKMARK "bookmark"   /**< bookmark table*/
 #define DB_TABLE_STORAGE "storage"     /**< storage table*/
 #define DB_TABLE_FACE "face"           /**< face table*/
-#define DB_TABLE_FACE_SCAN_LIST "face_scan_list"       /**< face_scan_list table*/
 
 /**
  * View Name
@@ -60,7 +59,6 @@ extern "C" {
 #define DB_TRIGGER_TAG_MAP "tag_map_cleanup"           /**< media to map*/
 #define DB_TRIGGER_TAG_MAP1 "tag_map_cleanup_1"                /**< tag to map*/
 #define DB_TRIGGER_BOOKMARK "bookmark_cleanup"
-#define DB_TRIGGER_FACE_SCAN_LIST "face_scan_list_cleanup"
 #define DB_TRIGGER_FACE "face_cleanup"
 
 /**

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 1a6b43425e5e97541c2aeb9de1c924d77c140e3b..66bd55140cd6e00c9776d8e20536cc8bc9eb61de 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.7.0
+Version:    0.7.1
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/media-svc-db-utils.c b/src/media-svc-db-utils.c
index 5e9c9365fc40532a11bfbd0cac792c36a6db4dfa..2ef55faec68bb4a2a14826765c72cd9b6f1baacc 100644 (file)
--- a/src/media-svc-db-utils.c
+++ b/src/media-svc-db-utils.c
@@ -37,7 +37,6 @@ typedef enum {
        DB_LIST_TAG,
        DB_LIST_BOOKMARK,
        DB_LIST_STORAGE,
-       DB_LIST_FACE_SCAN_LIST,
        DB_LIST_FACE,
        DB_LIST_MAX,
 } media_svc_table_slist_e;
@@ -357,8 +356,7 @@ static void __media_svc_init_table_query(void)
        __add_table_info(DB_TABLE_TAG, DB_TRIGGER_TAG_MAP1, DB_TABLE_TAG, DB_TABLE_TAG_MAP, DB_VIEW_TAG);
        __add_table_info(DB_TABLE_BOOKMARK, DB_TRIGGER_BOOKMARK, DB_TABLE_MEDIA, DB_TABLE_BOOKMARK, NULL);
        __add_table_info(DB_TABLE_STORAGE, NULL, NULL, NULL, NULL);
-       __add_table_info(DB_TABLE_FACE_SCAN_LIST, DB_TRIGGER_FACE_SCAN_LIST, DB_TABLE_MEDIA, DB_TABLE_FACE_SCAN_LIST, NULL);
-       __add_table_info(DB_TABLE_FACE, DB_TRIGGER_FACE, DB_TABLE_FACE_SCAN_LIST, DB_TABLE_FACE, NULL);
+       __add_table_info(DB_TABLE_FACE, DB_TRIGGER_FACE, DB_TABLE_MEDIA, DB_TABLE_FACE, NULL);
 
        /*insert column info.. */
        /*media*/
@@ -449,10 +447,6 @@ static void __media_svc_init_table_query(void)
        __add_column_info(&column_list[DB_LIST_STORAGE], "storage_path", DB_TYPE_TEXT, "NOT NULL", false, false, false);
        __add_column_info(&column_list[DB_LIST_STORAGE], "validity", DB_TYPE_INT, "DEFAULT 1", false, false, false);
 
-       /*face scan list*/
-       __add_column_info(&column_list[DB_LIST_FACE_SCAN_LIST], "media_id", DB_TYPE_TEXT, "NOT NULL UNIQUE", false, true, false);
-       __add_column_info(&column_list[DB_LIST_FACE_SCAN_LIST], "modified_time", DB_TYPE_INT, "DEFAULT 0", false, false, false);
-
        /*face*/
        __add_column_info(&column_list[DB_LIST_FACE], "media_face_id", DB_TYPE_INT, "PRIMARY KEY AUTOINCREMENT", false, false, false);
        __add_column_info(&column_list[DB_LIST_FACE], "media_id", DB_TYPE_TEXT, "NOT NULL", true, true, false);
@@ -548,13 +542,6 @@ int _media_svc_create_table(uid_t uid)
                goto ERROR;
        }
 
-       /*create face table. from tizen 3.0*/
-       ret = __media_svc_make_table_query(DB_TABLE_FACE_SCAN_LIST, DB_LIST_FACE_SCAN_LIST, uid);
-       if (ret != MS_MEDIA_ERR_NONE) {
-               media_svc_error("failed to create face_scan_list table");
-               goto ERROR;
-       }
-
        ret = __media_svc_make_table_query(DB_TABLE_FACE, DB_LIST_FACE, uid);
        if (ret != MS_MEDIA_ERR_NONE) {
                media_svc_error("failed to create face table");