Added ccompare to ICU

osmandapp · Jan 28, 2017 · a2aa11f · a2aa11f
1 parent 6bf126c
commit a2aa11f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/include/OsmAndCore/ICU.h b/include/OsmAndCore/ICU.h
@@ -29,6 +29,7 @@ namespace OsmAnd
         OSMAND_CORE_API bool OSMAND_CORE_CALL ccontains(const QString& _base, const QString& _part);
         OSMAND_CORE_API bool OSMAND_CORE_CALL cstartsWith(const QString& _searchInParam, const QString& _theStart,
                                 bool checkBeginning, bool checkSpaces, bool equals);
+        OSMAND_CORE_API int OSMAND_CORE_CALL ccompare(const QString& _base, const QString& _part);
     }
 }
 

diff --git a/src/ICU.cpp b/src/ICU.cpp
@@ -518,3 +518,25 @@ OSMAND_CORE_API bool OSMAND_CORE_CALL OsmAnd::ICU::cstartsWith(const QString& _s
     return result;
 }
 
+OSMAND_CORE_API int OSMAND_CORE_CALL OsmAnd::ICU::ccompare(const QString& _s1, const QString& _s2)
+{
+    UErrorCode icuError = U_ZERO_ERROR;
+    int result = 0;
+    const auto collator = g_pIcuCollator->clone();
+    if (collator == nullptr || U_FAILURE(icuError))
+    {
+        LogPrintf(LogSeverityLevel::Error, "ICU error: %d", icuError);
+        if (collator != nullptr)
+            delete collator;
+        return result;
+    }
+    else
+    {
+        UnicodeString s1 = qStrToUniStr(_s1);
+        UnicodeString s2 = qStrToUniStr(_s2);
+        result = collator->compare(s1, s2);
+    }
+    if (collator != nullptr)
+        delete collator;
+    return result;
+}