Improve filter function

[platform/core/api/media-content.git] / include_product / media_info_private.h

diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h
index 9bb62bd..621002b 100755 (executable)
--- a/include_product/media_info_private.h
+++ b/include_product/media_info_private.h
@@ -549,8 +549,8 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define DB_FIELD_UHD_PLAYED_COUNT                      "played_count"
 
 /* DB Query Keyword */
-#define QUERY_KEYWORD_AND "AND"
-#define QUERY_KEYWORD_OR "OR"
+#define QUERY_KEYWORD_AND "AND "
+#define QUERY_KEYWORD_OR "OR "
 #define QUERY_KEYWORD_ORDER_BY "ORDER BY "
 #define QUERY_KEYWORD_LIMIT "limit"
 #define QUERY_KEYWORD_DESC "DESC"
@@ -610,7 +610,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define REMOVE_TAG_ITEM_FROM_TAG_MAP           "DELETE FROM "DB_TABLE_TAG_MAP" WHERE tag_id=%d AND media_id='%q';"
 #define UPDATE_TAG_NAME_FROM_TAG                       "UPDATE "DB_TABLE_TAG" SET tag_name='%q' WHERE tag_id=%d;"
 #define SELECT_TAG_COUNT_BY_MEDIA_ID                   "SELECT COUNT(*) FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
-#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s'"
+#define SELECT_TAG_LIST_BY_MEDIA_ID                            "SELECT tag_id, tag_name FROM "DB_VIEW_TAG" WHERE media_id = '%s' "
 
 /* Get Media list of Group */
 #ifdef _USE_SENIOR_MODE
@@ -735,7 +735,7 @@ typedef struct _media_content_scan_cb_data_v2 {
 #define SELECT_UHD_FROM_UHD                            "SELECT * FROM "DB_TABLE_UHD" WHERE media_id='%q'"
 #define UPDATE_UHD_META_FROM_UHD               "UPDATE "DB_TABLE_UHD" SET content_title=%Q, release_date=%Q, played_position=%d, sub_type=%d, played_count=%d WHERE media_id='%q'"
 
-int _content_query_prepare(char *select_query, char *condition_query, char *option_query, sqlite3_stmt **stmt);
+int _content_query_prepare(const char *select_query, const char *condition_query, const char *option_query, sqlite3_stmt **stmt);
 int _content_get_result(char *query, sqlite3_stmt **stmt);
 int _content_error_capi(int internal_error);
 int _content_query_sql(char *query_str);
@@ -772,9 +772,8 @@ int _media_db_get_pvr_group_item(const char *group_name, filter_h filter, media_
 int _media_db_get_uhd(filter_h filter, media_uhd_cb callback, void *user_data);
 void _media_uhd_item_get_detail(sqlite3_stmt* stmt, media_uhd_h uhd);
 
-int _media_filter_attribute_generate(filter_h filter, char **generated_condition);
-int _media_filter_attribute_option_generate(filter_h filter, char **generated_option);
-int _media_filter_attribute_option_generate_with_full_query(filter_h filter, char **generated_option);
+int _media_filter_build_condition(bool is_full, const char *condition, media_content_collation_e collate_type, char **result);
+int _media_filter_build_option(filter_h filter, char **result);
 
 GMutex* _content_get_db_mutex(void);