Remove request_id

[platform/core/api/media-content.git] / src / media_filter.c

diff --git a/src/media_filter.c b/src/media_filter.c
index e1fd76f..afb90d9 100755 (executable)
--- a/src/media_filter.c
+++ b/src/media_filter.c
@@ -17,33 +17,6 @@
 
 #include <media_info_private.h>
 #include <media_util_private.h>
-#include <vconf.h>
-
-static bool __is_pinyin_needed(void)
-{
-       char *lang = NULL;
-       const char *china = "zh_CN";
-       const char *hongkong = "zh_HK";
-       int ret = FALSE;
-
-       /*Check CSC first*/
-       bool pinyin_support = FALSE;
-       media_svc_check_pinyin_support(&pinyin_support);
-       if (pinyin_support) {
-               /*Check Language Setting*/
-               lang = vconf_get_str(VCONFKEY_LANGSET);
-               content_retvm_if(lang == NULL, ret, "Fail to get string of language set");
-
-               if ((strncmp(china, lang, strlen(china)) == 0) ||
-                       (strncmp(hongkong, lang, strlen(hongkong)) == 0)) {
-                       ret = TRUE;
-               }
-
-               SAFE_FREE(lang);
-       }
-
-       return ret;
-}
 
 static const char *__get_order_str(media_content_order_e order_enum)
 {
@@ -65,10 +38,7 @@ static const char *__get_collate_str(media_content_collation_e collate_type)
        case MEDIA_CONTENT_COLLATE_RTRIM:
                return " COLLATE RTRIM ";
        case MEDIA_CONTENT_COLLATE_LOCALIZED:
-               if (__is_pinyin_needed())
-                       return " COLLATE NOCASE ";
-               else
-                       return " COLLATE localized ";
+               return " COLLATE localized ";
        default:
                return " ";
        }
@@ -140,7 +110,11 @@ int _media_filter_build_option(filter_h filter, char **result)
                        _filter->offset,
                        _filter->count);
        } else {
+#ifdef _USE_TVPD_MODE
                *result = g_strdup_printf("%s LIMIT %d, %d", _filter->order_keyword, _filter->offset, _filter->count);
+#else
+               *result = g_strdup_printf("ORDER BY %s LIMIT %d, %d", _filter->order_keyword, _filter->offset, _filter->count);
+#endif
        }
 
        return MEDIA_CONTENT_ERROR_NONE;
@@ -208,16 +182,7 @@ int media_filter_set_condition(filter_h filter, const char *condition, media_con
        _filter->is_full_condition = false;
        g_free(_filter->condition);
 
-       _filter->condition = _media_content_replace_path_in_condition(condition);
-
-       /* FIXME
-               If an error is occured in _media_content_replace_path_in_condition(),
-               A suitable return value is 'MEDIA_CONTENT_ERROR_INVALID_OPERATION'.
-               However, it is not stated in the description of media_filter_set_condition().
-               Therefore, use 'MEDIA_CONTENT_ERROR_OUT_OF_MEMORY' temporarily.
-               It will be modified after removing _media_content_replace_path_in_condition() function.
-       */
-       content_retvm_if(_filter->condition == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Fail to set condition");
+       _filter->condition = g_strdup(condition);
 
        content_sec_debug("Condition string : %s", _filter->condition);
 
@@ -245,10 +210,9 @@ int media_filter_set_order(filter_h filter, media_content_order_e order_type, co
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
-
+#ifdef _USE_TVPD_MODE
 int media_filter_set_storage(filter_h filter, const char *storage_id)
 {
-       content_warn("DEPRECATION WARNING: media_filter_set_storage() is deprecated and will be removed from next release. Use media_filter_set_condition() with MEDIA_PATH keyword instead.");
        filter_s *_filter = (filter_s *)filter;
 
        content_retip_if_fail(filter);
@@ -261,7 +225,7 @@ int media_filter_set_storage(filter_h filter, const char *storage_id)
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
-
+#endif
 int media_filter_get_offset(filter_h filter, int *offset, int *count)
 {
        filter_s *_filter = (filter_s *)filter;
@@ -310,19 +274,6 @@ int media_filter_get_order(filter_h filter, media_content_order_e *order_type, c
        return MEDIA_CONTENT_ERROR_NONE;
 }
 
-int media_filter_get_storage(filter_h filter, char **storage_id)
-{
-       content_warn("DEPRECATION WARNING: media_filter_get_storage() is deprecated and will be removed from next release.");
-       filter_s *_filter = (filter_s *)filter;
-
-       content_retip_if_fail(filter);
-       content_retip_if_fail(storage_id);
-
-       *storage_id = g_strdup(_filter->storage_id);
-
-       return MEDIA_CONTENT_ERROR_NONE;
-}
-
 int media_filter_set_condition_v2(filter_h filter, const char *condition)
 {
        filter_s *_filter = (filter_s *)filter;
@@ -334,15 +285,7 @@ int media_filter_set_condition_v2(filter_h filter, const char *condition)
 
        g_free(_filter->condition);
 
-       /* FIXME
-               If an error is occured in _media_content_replace_path_in_condition(),
-               A suitable return value is 'MEDIA_CONTENT_ERROR_INVALID_OPERATION'.
-               However, it is not stated in the description of media_filter_set_condition().
-               Therefore, use 'MEDIA_CONTENT_ERROR_OUT_OF_MEMORY' temporarily.
-               It will be modified after removing _media_content_replace_path_in_condition() function.
-       */
-       _filter->condition = _media_content_replace_path_in_condition(condition);
-       content_retvm_if(_filter->condition == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Fail to set condition");
+       _filter->condition = g_strdup(condition);
 
        content_sec_debug("Condition string : %s", _filter->condition);
 
@@ -389,4 +332,3 @@ int media_filter_get_order_v2(filter_h filter, char **order)
 
        return MEDIA_CONTENT_ERROR_NONE;
 }
-