From: Teodor Sigaev <teodor@sigaev.ru>
Date: Thu, 15 Jan 2009 18:05:04 +0000 (+0000)
Subject: Fix generation of too long headline with ShortWords.
X-Git-Tag: REL8_1_16~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff25ee0c7ad4889bfd3da8a2bfb392aba1b7692b;p=thirdparty%2Fpostgresql.git

Fix generation of too long headline with ShortWords.
Per http://archives.postgresql.org/pgsql-hackers/2008-09/msg01088.php
---

diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c
index 25e409786e6..8e84222dd9d 100644
--- a/contrib/tsearch2/wparser_def.c
+++ b/contrib/tsearch2/wparser_def.c
@@ -298,12 +298,14 @@ prsd_headline(PG_FUNCTION_ARGS)
 				if (curlen < min_words && i >= prs->curwords)
 				{				/* got end of text and our cover is shoter
 								 * than min_words */
-					for (i = p; i >= 0; i--)
+					for (i = p - 1 ; i >= 0; i--)
 					{
 						if (!NONWORDTOKEN(prs->words[i].type))
 							curlen++;
 						if (prs->words[i].item && !prs->words[i].repeated)
 							poslen++;
+						if ( curlen >= max_words )
+							break;
 						if (NOENDTOKEN(prs->words[i].type) || prs->words[i].len <= shortword)
 							continue;
 						if (curlen >= min_words)