[Fix] Fix normalization of non-alphabet based languages

diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c
index 9ac6fb4456152b083e3c9a096149b9d357b99f28..9dd3624fb812c3dff999b4d9fb4eb000b7725eca 100644 (file)
--- a/src/libstat/backends/redis_backend.c
+++ b/src/libstat/backends/redis_backend.c
@@ -526,7 +526,8 @@ rspamd_redis_tokens_to_query (struct rspamd_task *task,
                                                                "HSET %b_tokens %b %b",
                                                                prefix, (size_t) prefix_len,
                                                                n0, (size_t) l0,
-                                                               tok->t1->stemmed.begin, tok->t1->stemmed.len);
+                                                               tok->t1->stemmed.begin,
+                                                               tok->t1->stemmed.len);
                                        }
                                }
                                else {

diff --git a/src/libstat/tokenizers/tokenizers.c b/src/libstat/tokenizers/tokenizers.c
index ea3c84c67c1ba24d654e7d52ddab6fd03605f21b..000f2033c7b0f028ac938879c18071019de557c4 100644 (file)
--- a/src/libstat/tokenizers/tokenizers.c
+++ b/src/libstat/tokenizers/tokenizers.c
@@ -679,14 +679,10 @@ rspamd_uchars_to_ucs32 (const UChar *src, gsize srclen,
                        }
 #endif
 
-                       if (cat == U_UPPERCASE_LETTER ||
-                                       cat == U_LOWERCASE_LETTER ||
-                                       cat == U_DECIMAL_DIGIT_NUMBER ||
+                       if ((cat >= U_UPPERCASE_LETTER && cat <= U_OTHER_NUMBER) ||
                                        cat == U_CONNECTOR_PUNCTUATION ||
                                        cat == U_MATH_SYMBOL ||
-                                       cat == U_CURRENCY_SYMBOL ||
-                                       cat == U_INITIAL_PUNCTUATION ||
-                                       cat == U_FINAL_PUNCTUATION) {
+                                       cat == U_CURRENCY_SYMBOL) {
                                *d++ = u_tolower (t);
                        }
                }