From f3def9e9e12bd18708088cfba38188f6d98c0d8f Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Wed, 17 Apr 2019 15:37:18 +0900 Subject: [PATCH] Match columns of media with filter keyword Change-Id: I1827edfffe664ea876690a2704c2448ca45640d0 Signed-off-by: Minje Ahn --- src/dcm_svc_db.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/dcm_svc_db.c b/src/dcm_svc_db.c index 818649f..9e46afc 100755 --- a/src/dcm_svc_db.c +++ b/src/dcm_svc_db.c @@ -27,11 +27,11 @@ #define DB_TABLE_FACE_SCAN_LIST "face_scan_list" #define DB_VIEW_MEDIA "media_view" -#define FACE_ITEM "media_uuid, face_rect_x , face_rect_y, face_rect_w , face_rect_h, face_orientation" -#define SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB "SELECT media_uuid, width, height, orientation, mime_type, modified_time FROM "DB_VIEW_MEDIA" WHERE path = '%q';" -#define SELECT_SCAN_INFO_BY_MEDIA_ID "SELECT modified_time FROM "DB_TABLE_FACE_SCAN_LIST" WHERE media_uuid = '%q';" +#define FACE_ITEM "media_id, face_rect_x , face_rect_y, face_rect_w , face_rect_h, face_orientation" +#define SELECT_MEDIA_INFO_BY_FILE_PATH_FROM_DB "SELECT media_id, media_width, media_height, media_orientation, media_mime_type, media_modified_time FROM "DB_VIEW_MEDIA" WHERE media_path = '%q';" +#define SELECT_SCAN_INFO_BY_MEDIA_ID "SELECT modified_time FROM "DB_TABLE_FACE_SCAN_LIST" WHERE media_id = '%q';" #define INSERT_FACE_ITEM_TO_DB "INSERT OR IGNORE INTO " DB_TABLE_FACE" (" FACE_ITEM") VALUES ('%q', %d, %d, %d, %d, %d);" -#define SELECT_FACE_COUNT_BY_MEDIA_ID "SELECT COUNT(*) FROM " DB_TABLE_FACE" WHERE media_uuid = '%q';" +#define SELECT_FACE_COUNT_BY_MEDIA_ID "SELECT COUNT(*) FROM " DB_TABLE_FACE" WHERE media_id = '%q';" static GMutex gMutexLock; static sqlite3 *db_handle; @@ -195,7 +195,7 @@ int dcm_svc_db_insert_face_to_face_scan_list(dcm_svc_item_s *scan_item) dcm_retvm_if(scan_item == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid scan_item"); dcm_retvm_if(scan_item->media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid"); - query_string = sqlite3_mprintf("INSERT OR REPLACE INTO %s (media_uuid, modified_time) values('%q', %d)", DB_TABLE_FACE_SCAN_LIST, scan_item->media_uuid, scan_item->modified_time); + query_string = sqlite3_mprintf("INSERT OR REPLACE INTO %s (media_id, modified_time) values('%q', %d)", DB_TABLE_FACE_SCAN_LIST, scan_item->media_uuid, scan_item->modified_time); dcm_debug("query[%s]", query_string); g_mutex_trylock(&gMutexLock); @@ -222,7 +222,7 @@ int dcm_svc_db_delete_face_from_db(const char *media_uuid) dcm_retvm_if(db_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid db_handle"); dcm_retvm_if(media_uuid == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid media_uuid"); - query_string = sqlite3_mprintf("DELETE FROM %s WHERE media_uuid='%q'", DB_TABLE_FACE, media_uuid); + query_string = sqlite3_mprintf("DELETE FROM %s WHERE media_id='%q'", DB_TABLE_FACE, media_uuid); dcm_sec_debug("query[%s]", query_string); g_mutex_trylock(&gMutexLock); -- 2.34.1