From b0a89a8d7986c245096343a2da6c8d1abb1494fd Mon Sep 17 00:00:00 2001 From: Haejeong Kim Date: Wed, 16 Aug 2017 14:08:51 +0900 Subject: [PATCH] face related db schema changed 1. user_marked field will be "1" for the user added face info. 2. modified_time field will be "0" when user remove system dete Change-Id: I3fbe078520136e035dae580e323d7efc5f081735 --- include/media_info_private.h | 5 ++++- packaging/capi-content-media-content.spec | 2 +- src/media_face.c | 22 +++++++++++++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/include/media_info_private.h b/include/media_info_private.h index 3e4cfd8..d25df4f 100755 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -661,7 +661,7 @@ typedef struct _media_content_cb_data { /* Face */ #define DELETE_FACE_FROM_FACE "DELETE FROM "DB_TABLE_FACE" WHERE face_uuid='%q'" -#define INSERT_FACE_TO_FACE "INSERT INTO "DB_TABLE_FACE" (face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag) VALUES ('%q', '%q', %d, %d, %d, %d, %d, %Q);" +#define INSERT_FACE_TO_FACE "INSERT INTO "DB_TABLE_FACE" (face_uuid, media_uuid, face_rect_x , face_rect_y, face_rect_w, face_rect_h, orientation, face_tag, user_marked) VALUES ('%q', '%q', %d, %d, %d, %d, %d, %Q, 1);" #define UPDATE_FACE_TO_FACE "UPDATE "DB_TABLE_FACE" SET face_rect_x=%d, face_rect_y=%d, face_rect_w=%d, face_rect_h=%d, orientation=%d, face_tag=%Q WHERE face_uuid='%q'" #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID "SELECT COUNT(*) FROM "DB_TABLE_MEDIA_VIEW" WHERE media_uuid='%q' AND validity=1" #define SELECT_FACE_COUNT "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN @@ -669,6 +669,9 @@ typedef struct _media_content_cb_data { #define SELECT_FACE_LIST "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN #define SELECT_FACE_LIST_BY_MEDIA_ID "SELECT fa.face_uuid, fa.media_uuid, fa.face_rect_x, fa.face_rect_y, fa.face_rect_w, fa.face_rect_h, fa.orientation, fa.face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'" #define SELECT_FACE_PATH_FROM_MEDIA "SELECT path FROM "DB_TABLE_MEDIA_VIEW" media_uuid='%s'" +#define SELECT_MEDIA_FROM_FACE "SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_uuid='%q' AND user_marked = 0" +#define UPDATE_MEDIA_INFO "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid='%q'" + #define DEFAULT_MEDIA_STORAGE_ID "media" diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index a30d87b..f049d25 100755 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.3.21 +Version: 0.3.22 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_face.c b/src/media_face.c index 30483ce..745dcf0 100755 --- a/src/media_face.c +++ b/src/media_face.c @@ -291,9 +291,29 @@ int media_face_delete_from_db(const char *face_id) { int ret = MEDIA_CONTENT_ERROR_NONE; char *query_str = NULL; - + char *media_id = NULL; + sqlite3_stmt *stmt = NULL; media_content_retvm_if(!STRING_VALID(face_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid face_id"); + /*To refresh face information(User try to start_face_detection again for the already scanned item), + mark media modified_time to '0' if user delete system extracted face info. */ + + query_str = sqlite3_mprintf(SELECT_MEDIA_FROM_FACE, face_id); + ret = _content_query_prepare(&stmt, query_str, NULL, NULL); + SQLITE3_SAFE_FREE(query_str); + media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret); + + while (sqlite3_step(stmt) == SQLITE_ROW) + media_id = g_strdup((const char *)sqlite3_column_text(stmt, 0)); + SQLITE3_FINALIZE(stmt); + + if (STRING_VALID(media_id)) { + query_str = sqlite3_mprintf(UPDATE_MEDIA_INFO, media_id); + ret = _content_query_sql(query_str); + SQLITE3_SAFE_FREE(query_str); + } + SAFE_FREE(media_id); + query_str = sqlite3_mprintf(DELETE_FACE_FROM_FACE, face_id); ret = _content_query_sql(query_str); -- 2.7.4