Restore the use of unidecode for in/ni operators (felt#212)

* Restore the use of unidecode for in/ni operators * Update changelog and version
RizkiAlhamid · Mar 8, 2024 · 655eccf · 655eccf
1 parent 021bb96
commit 655eccf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 2.50.0
+
+* FSL-style "in" expressions use unidecode again
+
 # 2.49.0
 
 * FSL-style "in" expressions now allow numeric comparisons, but they no longer use unidecode to remove diacritics.

diff --git a/evaluator.cpp b/evaluator.cpp
@@ -387,16 +387,15 @@ static int eval(std::function<mvt_value(std::string const &)> feature, json_obje
 		if (f->value.array.array[2]->type == JSON_ARRAY &&
 		    (strcmp(f->value.array.array[1]->value.string.string, "in") == 0 ||
 		     strcmp(f->value.array.array[1]->value.string.string, "ni") == 0)) {
-			static std::vector<std::string> no_unidecode_data;
-			std::string s = mvt_value_to_string(lhs, fail, no_unidecode_data);
+			std::string s = mvt_value_to_string(lhs, fail, unidecode_data);
 			if (fail) {
 				return -1;  // null in anything => false
 			}
 
 			bool contains = false;
 			for (size_t i = 0; i < f->value.array.array[2]->value.array.length; i++) {
 				fail = false;
-				int cmp = compare_fsl(ff, f->value.array.array[2]->value.array.array[i], fail, no_unidecode_data);
+				int cmp = compare_fsl(ff, f->value.array.array[2]->value.array.array[i], fail, unidecode_data);
 				if (fail) {
 					continue;  // null
 				}

diff --git a/version.hpp b/version.hpp
@@ -1,6 +1,6 @@
 #ifndef VERSION_HPP
 #define VERSION_HPP
 
-#define VERSION "v2.49.0"
+#define VERSION "v2.50.0"
 
 #endif