Reverted patch for tsearch/spell.c, merged from the REL9_5_STABLE branch, because it breaks Artur's improvements to dictionary load code

vbwagner · vbwagner · commit 9dab42543e14 · 2016-03-11T18:11:22.000+03:00
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
@@ -216,19 +216,6 @@ findchar(char *str, int c)
 	return NULL;
 }
 
-static char *
-findchar2(char *str, int c1, int c2)
-{
-	while (*str)
-	{
-		if (t_iseq(str, c1) || t_iseq(str, c2))
-			return str;
-		str += pg_mblen(str);
-	}
-
-	return NULL;
-}
-
 
 /* backward string compare for suffix tree operations */
 static int
@@ -1233,8 +1220,9 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
 
 			if (flag == 0)
 				goto nextline;
-			/* Get flags after '/' (flags are case sensitive) */
-			if ((ptr = strchr(repl, '/')) != NULL)
+			prepl = lowerstr_ctx(Conf, repl);
+			/* Find position of '/' in lowercased string "prepl" */
+			if ((ptr = strchr(prepl, '/')) != NULL)
 			{
 				/*
 				 * Here we use non-lowercased string "repl". We need position
@@ -1244,10 +1232,6 @@ NIImportOOAffixes(IspellDict *Conf, const char *filename)
 				ptr = repl + (ptr - prepl) + 1;
 				aflg |= getFlagValues(Conf, getFlags(Conf, ptr));
 			}
-			/* Get lowercased version of string before '/' */
-			prepl = lowerstr_ctx(Conf, repl);
-			if ((ptr = strchr(prepl, '/')) != NULL)
-				*ptr = '\0';
 			pfind = lowerstr_ctx(Conf, find);
 			pmask = lowerstr_ctx(Conf, mask);
 			if (t_iseq(find, '0'))
@@ -1317,10 +1301,12 @@ NIImportAffixes(IspellDict *Conf, const char *filename)
 
 		if (STRNCMP(pstr, "compoundwords") == 0)
 		{
-			/* Find case-insensitive L flag in non-lowercased string */
-			s = findchar2(recoded, 'l', 'L');
+			/* Find position in lowercased string "pstr" */
+			s = findchar(pstr, 'l');
 			if (s)
 			{
+				/* Here we use non-lowercased string "recoded" */
+				s = recoded + (s - pstr);
 				while (*s && !t_isspace(s))
 					s += pg_mblen(s);
 				while (*s && t_isspace(s))
