Remove alias keyword from face query

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

diff --git a/include/media_info_private.h b/include/media_info_private.h
index 0906b73..06c07f4 100755 (executable)
--- a/include/media_info_private.h
+++ b/include/media_info_private.h
@@ -380,7 +380,6 @@ typedef struct _media_content_cb_data {
 #define DB_TABLE_ALIAS_PLAYLIST_MAP    "pm"
 #define DB_TABLE_ALIAS_TAG                             "t"
 #define DB_TABLE_ALIAS_BOOKMARK                "b"
-#define DB_TABLE_ALIAS_FACE                            "fa"
 
 /* DB field for media */
 #define DB_FIELD_MEDIA_ID                                      "media_uuid"
@@ -478,7 +477,7 @@ typedef struct _media_content_cb_data {
 #define FOLDER_MEDIA_JOIN                                      "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.validity=1 "
 #define BOOKMARK_MEDIA_JOIN                            "("DB_TABLE_BOOKMARK" AS b INNER JOIN '%s' AS m ON (b.media_uuid = m.media_uuid)) WHERE m.validity=1"
 #define ALBUM_MEDIA_JOIN                                       "("DB_TABLE_ALBUM" AS a INNER JOIN '%s' AS m ON (a.album_id = m.album_id)) WHERE m.validity=1"
-#define FACE_MEDIA_JOIN                                                "("DB_TABLE_FACE" AS fa INNER JOIN '%s' AS m ON (fa.media_uuid = m.media_uuid)) WHERE m.validity=1"
+#define FACE_MEDIA_JOIN                                                "("DB_TABLE_FACE" AS fa INNER JOIN '%s' AS m ON (fa.media_uuid = m.media_uuid)) WHERE validity=1"
 
 /* Get Group List */
 #define SELECT_ALBUM_LIST                      "SELECT DISTINCT a.album_id, a.name, a.artist, a.album_art FROM "ALBUM_MEDIA_JOIN
@@ -584,8 +583,8 @@ typedef struct _media_content_cb_data {
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND validity=1"
 #define SELECT_FACE_COUNT                                      "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_LIST                                               "SELECT fa.face_id, 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_id, 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_LIST                                       "SELECT face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
 #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_id=%d)"
 #define SELECT_FACE_ID                 "SELECT face_id FROM "DB_TABLE_FACE" WHERE media_uuid='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND orientation=%d"
 

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index daf045e..808d1f1 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -482,7 +482,6 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_TABLE_ALIAS_PLAYLIST_MAP    "pm"
 #define DB_TABLE_ALIAS_TAG                             "t"
 #define DB_TABLE_ALIAS_BOOKMARK                "b"
-#define DB_TABLE_ALIAS_FACE                            "fa"
 
 /* DB field for media */
 #define DB_FIELD_MEDIA_ID                                      "media_uuid"
@@ -643,7 +642,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define FOLDER_MEDIA_JOIN                                      "("DB_TABLE_FOLDER" AS f LEFT OUTER JOIN '%s' AS m ON f.folder_uuid=m.folder_uuid AND m.validity=1) WHERE f.validity=1 "
 #define BOOKMARK_MEDIA_JOIN                            "("DB_TABLE_BOOKMARK" AS b INNER JOIN '%s' AS m ON (b.media_uuid = m.media_uuid)) WHERE m.validity=1"
 #define ALBUM_MEDIA_JOIN                                       "("DB_TABLE_ALBUM" AS a INNER JOIN '%s' AS m ON (a.album_id = m.album_id)) WHERE m.validity=1"
-#define FACE_MEDIA_JOIN                                                "("DB_TABLE_FACE" AS fa INNER JOIN '%s' AS m ON (fa.media_uuid = m.media_uuid)) WHERE m.validity=1"
+#define FACE_MEDIA_JOIN                                                "("DB_TABLE_FACE" AS fa INNER JOIN '%s' AS m ON (fa.media_uuid = m.media_uuid)) WHERE validity=1"
 
 /* Get Group info */
 #define SELECT_MEDIA_GROUP_AND_COUNT           "SELECT %s, COUNT(*) FROM '%s' WHERE validity=1 "
@@ -761,8 +760,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_MEDIA_COUNT_FROM_MEDIA_BY_ID            "SELECT COUNT(*) FROM "DB_VIEW_MEDIA" WHERE media_uuid='%q' AND validity=1"
 #define SELECT_FACE_COUNT                                      "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN
 #define SELECT_FACE_COUNT_BY_MEDIA_ID          "SELECT COUNT(*) FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
-#define SELECT_FACE_LIST                                               "SELECT fa.face_id, 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_id, 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_LIST                                       "SELECT face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, face_tag FROM "FACE_MEDIA_JOIN
+#define SELECT_FACE_LIST_BY_MEDIA_ID           "SELECT face_id, fa.media_uuid, face_rect_x, face_rect_y, face_rect_w, face_rect_h, fa.orientation, face_tag FROM "FACE_MEDIA_JOIN" AND fa.media_uuid='%s'"
 #define UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST    "UPDATE "DB_TABLE_FACE_SCAN_LIST" SET modified_time = 0 WHERE media_uuid IN (SELECT media_uuid FROM "DB_TABLE_FACE" WHERE face_id=%d)"
 #define SELECT_FACE_ID                 "SELECT face_id FROM "DB_TABLE_FACE" WHERE media_uuid='%q' AND face_rect_x=%d AND face_rect_y=%d AND face_rect_w=%d AND face_rect_h=%d AND orientation=%d"
 

diff --git a/src/media_content.c b/src/media_content.c
index b39905a..0b8adcc 100755 (executable)
--- a/src/media_content.c
+++ b/src/media_content.c
@@ -119,8 +119,8 @@ static media_content_attribute_info_s g_content_attrs_info[] = {
        {MEDIA_STORAGE_PATH,                    DB_FIELD_STORAGE_PATH,                                  NULL},
 
        /* Face */
-       {MEDIA_FACE_ID,                                 DB_FIELD_FACE_ID,                                               DB_TABLE_ALIAS_FACE"."DB_FIELD_FACE_ID},
-       {MEDIA_FACE_TAG,                                DB_FIELD_FACE_TAG,                                              DB_TABLE_ALIAS_FACE"."DB_FIELD_FACE_TAG},
+       {MEDIA_FACE_ID,                                 DB_FIELD_FACE_ID,                                               NULL},
+       {MEDIA_FACE_TAG,                                DB_FIELD_FACE_TAG,                                              NULL},
 
 #ifdef _USE_SENIOR_MODE
        {MEDIA_CONTACT,                         DB_FIELD_MEDIA_CONTACT,                         DB_TABLE_ALIAS_MEDIA"."DB_FIELD_MEDIA_CONTACT},

diff --git a/src/media_db.c b/src/media_db.c
index dd2ea03..28ada2a 100755 (executable)
--- a/src/media_db.c
+++ b/src/media_db.c
@@ -289,8 +289,6 @@ int _media_db_get_group_count(filter_h filter, group_list_e group_type, int *gro
                }
                break;
        case MEDIA_GROUP_FACE:
-               attr = _content_get_alias_attirbute_handle();
-
                if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
                        snprintf(select_query, sizeof(select_query), SELECT_FACE_COUNT, _filter->storage_id);
                else
@@ -849,7 +847,7 @@ int _media_db_get_face(const char *media_id, filter_h filter, media_face_cb call
        attribute_h attr = NULL;
        filter_s *_filter = (filter_s*)filter;
 
-       attr = _content_get_alias_attirbute_handle();
+       attr = _content_get_attirbute_handle();
 
        memset(select_query, 0x00, sizeof(select_query));
 
@@ -999,8 +997,6 @@ int _media_db_get_group_item_count(const char *group_name, filter_h filter, grou
 
                SAFE_STRLCAT(select_query, tmp_query, sizeof(select_query));
        } else if (group_type == MEDIA_GROUP_FACE_BY_MEDIA_ID) {
-               attr = _content_get_alias_attirbute_handle();
-
                if ((_filter != NULL) && STRING_VALID(_filter->storage_id))
                        tmp_query = sqlite3_mprintf(SELECT_FACE_COUNT_BY_MEDIA_ID, _filter->storage_id, group_name);
                else