core: Move collation handling with other unicode code

Move these implementations together with the libicu/libunistring
implementations.

1 files changed, 1 insertions, 166 deletions

diff --git a/src/libtracker-sparql/core/tracker-collation.c b/src/libtracker-sparql/core/tracker-collation.c
index 16ba56bcb..0e82d66dd 100644
--- a/src/libtracker-sparql/core/tracker-collation.c
+++ b/src/libtracker-sparql/core/tracker-collation.c
@@ -18,177 +18,12 @@
  */
 
 #include "config.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <string.h>
-#include <locale.h>
 
-#include <libtracker-common/tracker-debug.h>
-#include <libtracker-common/tracker-locale.h>
 #include "tracker-collation.h"
 
-/* If defined, will dump additional traces */
-#ifdef G_ENABLE_DEBUG
-#define trace(message, ...) TRACKER_NOTE (COLLATION, g_message (message, ##__VA_ARGS__))
-#else
-#define trace(...)
-#endif
-
-#ifdef HAVE_LIBUNISTRING
-/* libunistring versions prior to 9.1.2 need this hack */
-#define _UNUSED_PARAMETER_
-#include <unistr.h>
-#elif defined(HAVE_LIBICU)
-#include <unicode/ucol.h>
-#include <unicode/utypes.h>
-#endif
-
-/* If string lenth less than this value, allocating from the stack */
-#define MAX_STACK_STR_SIZE 8192
-
-#ifdef HAVE_LIBUNISTRING /* ---- GNU libunistring based collation ---- */
-
-gpointer
-tracker_collation_init (void)
-{
-	gchar *locale;
-
-	/* Get locale! */
-	locale = tracker_locale_get (TRACKER_LOCALE_COLLATE);
-	TRACKER_NOTE (COLLATION, g_message ("[libunistring collation] Initializing collator for locale '%s'", locale));
-	g_free (locale);
-	/* Nothing to do */
-	return NULL;
-}
-
-void
-tracker_collation_shutdown (gpointer collator)
-{
-	/* Nothing to do */
-}
-
-gint
-tracker_collation_utf8 (gpointer      collator,
-                        gint          len1,
-                        gconstpointer str1,
-                        gint          len2,
-                        gconstpointer str2)
-{
-	gint result;
-	gchar *aux1;
-	gchar *aux2;
-
-	/* Note: str1 and str2 are NOT NUL-terminated */
-	aux1 = (len1 < MAX_STACK_STR_SIZE) ? g_alloca (len1+1) : g_malloc (len1+1);
-	aux2 = (len2 < MAX_STACK_STR_SIZE) ? g_alloca (len2+1) : g_malloc (len2+1);
-
-	memcpy (aux1, str1, len1); aux1[len1] = '\0';
-	memcpy (aux2, str2, len2); aux2[len2] = '\0';
-
-	result = u8_strcoll (aux1, aux2);
-
-	trace ("(libunistring) Collating '%s' and '%s' (%d)",
-	       aux1, aux2, result);
-
-	if (len1 >= MAX_STACK_STR_SIZE)
-		g_free (aux1);
-	if (len2 >= MAX_STACK_STR_SIZE)
-		g_free (aux2);
-	return result;
-}
-
-#elif defined(HAVE_LIBICU) /* ---- ICU based collation (UTF-16) ----*/
-
-gpointer
-tracker_collation_init (void)
-{
-	UCollator *collator = NULL;
-	UErrorCode status = U_ZERO_ERROR;
-	gchar *locale;
-
-	/* Get locale! */
-	locale = tracker_locale_get (TRACKER_LOCALE_COLLATE);
-
-	TRACKER_NOTE (COLLATION, g_message ("[ICU collation] Initializing collator for locale '%s'", locale));
-	collator = ucol_open (locale, &status);
-	if (!collator) {
-		g_warning ("[ICU collation] Collator for locale '%s' cannot be created: %s",
-		           locale, u_errorName (status));
-		/* Try to get UCA collator then... */
-		status = U_ZERO_ERROR;
-		collator = ucol_open ("root", &status);
-		if (!collator) {
-			g_critical ("[ICU collation] UCA Collator cannot be created: %s",
-			            u_errorName (status));
-		}
-	}
-	g_free (locale);
-	return collator;
-}
-
-void
-tracker_collation_shutdown (gpointer collator)
-{
-	if (collator)
-		ucol_close ((UCollator *)collator);
-}
-
-gint
-tracker_collation_utf8 (gpointer      collator,
-                        gint          len1,
-                        gconstpointer str1,
-                        gint          len2,
-                        gconstpointer str2)
-{
-	UErrorCode status = U_ZERO_ERROR;
-	UCharIterator iter1;
-	UCharIterator iter2;
-	UCollationResult result;
-
-	/* Collator must be created before trying to collate */
-	g_return_val_if_fail (collator, -1);
-
-	/* Setup iterators */
-	uiter_setUTF8 (&iter1, str1, len1);
-	uiter_setUTF8 (&iter2, str2, len2);
-
-	result = ucol_strcollIter ((UCollator *)collator,
-	                           &iter1,
-	                           &iter2,
-	                           &status);
-	if (status != U_ZERO_ERROR)
-		g_critical ("Error collating: %s", u_errorName (status));
-
-#ifdef ENABLE_TRACE
-	{
-		gchar *aux1;
-		gchar *aux2;
-
-		/* Note: str1 and str2 are NOT NUL-terminated */
-		aux1 = (len1 < MAX_STACK_STR_SIZE) ? g_alloca (len1+1) : g_malloc (len1+1);
-		aux2 = (len2 < MAX_STACK_STR_SIZE) ? g_alloca (len2+1) : g_malloc (len2+1);
-
-		memcpy (aux1, str1, len1); aux1[len1] = '\0';
-		memcpy (aux2, str2, len2); aux2[len2] = '\0';
-
-		trace ("(ICU) Collating '%s' and '%s' (%d)",
-		       aux1, aux2, result);
-
-		if (len1 >= MAX_STACK_STR_SIZE)
-			g_free (aux1);
-		if (len2 >= MAX_STACK_STR_SIZE)
-			g_free (aux2);
-	}
-#endif /* ENABLE_TRACE */
-
-	if (result == UCOL_GREATER)
-		return 1;
-	if (result == UCOL_LESS)
-		return -1;
-	return 0;
-}
-#endif
-
 static gboolean
 skip_non_alphanumeric (const gchar **str,
                        gint         *len)