[ACR-1881] Add natural collate type

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

diff --git a/include/media_content_type.h b/include/media_content_type.h
index 96cde1110decc2de4d0863eef00ff6c882620071..9d851fce10d0308dc542317066e352bb5f82eff6 100644 (file)
--- a/include/media_content_type.h
+++ b/include/media_content_type.h
@@ -116,6 +116,7 @@ typedef enum {
        MEDIA_CONTENT_COLLATE_NOCASE    = 1,        /**< Collation NOCASE, not case sensitive */
        MEDIA_CONTENT_COLLATE_RTRIM     = 2,        /**< Collation RTRIM, trailing space characters are ignored */
        MEDIA_CONTENT_COLLATE_LOCALIZED = 3,        /**< Collation LOCALIZATION, NOCASE also applied */
+       MEDIA_CONTENT_COLLATE_MIXED     = 4,        /**< Collation MIXED, natural sort order (Since 10.0) */
 } media_content_collation_e;
 
 /**

diff --git a/include_product/media_content_type.h b/include_product/media_content_type.h
index cec64e184f63cb1c027c82371277714bc626984e..443e702e6dfe681217f2243c901ad13d96ac7768 100644 (file)
--- a/include_product/media_content_type.h
+++ b/include_product/media_content_type.h
@@ -121,6 +121,7 @@ typedef enum {
        MEDIA_CONTENT_COLLATE_NOCASE    = 1,        /**< Collation NOCASE, not case sensitive */
        MEDIA_CONTENT_COLLATE_RTRIM     = 2,        /**< Collation RTRIM, trailing space characters are ignored */
        MEDIA_CONTENT_COLLATE_LOCALIZED = 3,        /**< Collation LOCALIZATION, NOCASE also applied */
+       MEDIA_CONTENT_COLLATE_MIXED     = 4,        /**< Collation MIXED, natural sort order (Since 10.0) */
 } media_content_collation_e;
 
 /**

diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec
index 667159f121961a2f368ad3ffd0347ebaab984696..634fbc99718b9fd09d92da5279ce7cfc8e52e02e 100644 (file)
--- a/packaging/capi-content-media-content.spec
+++ b/packaging/capi-content-media-content.spec
@@ -1,7 +1,7 @@
 Name:       capi-content-media-content
 Summary:    A Media content library in Tizen Native API
-Version:    0.6.5
-Release:    1
+Version:    0.6.6
+Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/media_filter.c b/src/media_filter.c
index fe6fee54311860ccfafb877aefc2cfcd382018fc..2b5f1ed3e5a6af9f6a49e848fae9c7c6cdd80b51 100644 (file)
--- a/src/media_filter.c
+++ b/src/media_filter.c
@@ -39,6 +39,8 @@ static const char *__get_collate_str(media_content_collation_e collate_type)
                return " COLLATE RTRIM ";
        case MEDIA_CONTENT_COLLATE_LOCALIZED:
                return " COLLATE localized ";
+       case MEDIA_CONTENT_COLLATE_MIXED:
+               return " COLLATE MIXED ";
        default:
                return " ";
        }
@@ -51,6 +53,7 @@ static bool __check_collate_type(media_content_collation_e collate_type)
        case MEDIA_CONTENT_COLLATE_NOCASE:
        case MEDIA_CONTENT_COLLATE_RTRIM:
        case MEDIA_CONTENT_COLLATE_LOCALIZED:
+       case MEDIA_CONTENT_COLLATE_MIXED:
                return true;
        default:
                return false;