Minor logic fix for new levenshtein implementation.

tglsfdc · tglsfdc · commit 087bd179e63f · 2011-02-20T14:55:07.000-05:00
Alexander Korotkov
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
@@ -16,3 +16,6 @@ top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
+
+# levenshtein.c is #included by fuzzystrmatch.c
+fuzzystrmatch.o: fuzzystrmatch.c levenshtein.c
diff --git a/contrib/fuzzystrmatch/levenshtein.c b/contrib/fuzzystrmatch/levenshtein.c
@@ -377,7 +377,7 @@ levenshtein_internal(text *s, text *t,
 				prev[start_column] = max_d + 1;
 				curr[start_column] = max_d + 1;
 				if (start_column != 0)
-					s_data += s_char_len != NULL ? s_char_len[i - 1] : 1;
+					s_data += (s_char_len != NULL) ? s_char_len[start_column - 1] : 1;
 				start_column++;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -377,7 +377,7 @@ levenshtein_internal(text s, text t,`
`377`	`377`	`prev[start_column] = max_d + 1;`
`378`	`378`	`curr[start_column] = max_d + 1;`
`379`	`379`	`if (start_column != 0)`
`380`		`- s_data += s_char_len != NULL ? s_char_len[i - 1] : 1;`
	`380`	`+ s_data += (s_char_len != NULL) ? s_char_len[start_column - 1] : 1;`
`381`	`381`	`start_column++;`
`382`	`382`	`}`
`383`	`383`