NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commitbcec1e6

committed

More accuracy work with MinWords option of headline function

1 parentc090b05 commitbcec1e6Copy full SHA for bcec1e6

File tree

1 file changed

+19

-5

lines changed

contrib/tsearch2
- wparser_def.c

1 file changed

+19

-5

lines changed

`‎contrib/tsearch2/wparser_def.c`

Lines changed: 19 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,7 @@ prsd_headline(PG_FUNCTION_ARGS)`
`189`	`189`	`intbestb=-1,`
`190`	`190`	`beste=-1;`
`191`	`191`	`intbestlen=-1;`
`192`		`-intpose=0,`
	`192`	`+intpose=0,posb,`
`193`	`193`	`poslen,`
`194`	`194`	`curlen;`
`195`	`195`
`@@ -229,15 +229,15 @@ prsd_headline(PG_FUNCTION_ARGS)`
`229`	`229`	`if (min_words >=max_words)`
`230`	`230`	`ereport(ERROR,`
`231`	`231`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`232`		`-errmsg("must beMinWords < MaxWords")));`
	`232`	`+errmsg("MinWordsmust beless than MaxWords")));`
`233`	`233`	`if (min_words <=0)`
`234`	`234`	`ereport(ERROR,`
`235`	`235`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`236`		`-errmsg("must beMinWords> 0")));`
	`236`	`+errmsg("MinWordsshould be positive")));`
`237`	`237`	`if (shortword<0)`
`238`	`238`	`ereport(ERROR,`
`239`	`239`	`(errcode(ERRCODE_INVALID_PARAMETER_VALUE),`
`240`		`-errmsg("mustbeShortWord >= 0")));`
	`240`	`+errmsg("ShortWord houldbe = 0")));`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`while (hlCover(prs,query,&p,&q))`
`@@ -261,6 +261,7 @@ prsd_headline(PG_FUNCTION_ARGS)`
`261`	`261`	`continue;`
`262`	`262`	`}`
`263`	`263`
	`264`	`+posb=p;`
`264`	`265`	`if (curlen<max_words)`
`265`	`266`	`{/* find good end */`
`266`	`267`	`for (i=i-1;i<prs->curwords&&curlen<max_words;i++)`
`@@ -278,6 +279,19 @@ prsd_headline(PG_FUNCTION_ARGS)`
`278`	`279`	`if (curlen >=min_words)`
`279`	`280`	`break;`
`280`	`281`	`}`
	`282`	`+if (curlen<min_words&&i>=prs->curwords ) {/* got end of text and our cover is shoter than min_words */`
	`283`	`+for(i=p;i>=0;i--) {`
	`284`	`+if (!NONWORDTOKEN(prs->words[i].type))`
	`285`	`+curlen++;`
	`286`	`+if (prs->words[i].item&& !prs->words[i].repeated)`
	`287`	`+poslen++;`
	`288`	`+if (NOENDTOKEN(prs->words[i].type)\|\|prs->words[i].len <=shortword)`
	`289`	`+continue;`
	`290`	`+if (curlen >=min_words)`
	`291`	`+break;`
	`292`	`+}`
	`293`	`+posb=(i>=0) ?i :0;`
	`294`	`+}`
`281`	`295`	`}`
`282`	`296`	`else`
`283`	`297`	`{/* shorter cover :((( */`
`@@ -298,7 +312,7 @@ prsd_headline(PG_FUNCTION_ARGS)`
`298`	`312`	`(bestlen >=0&& !(NOENDTOKEN(prs->words[pose].type)\|\|prs->words[pose].len <=shortword)&&`
`299`	`313`	`(NOENDTOKEN(prs->words[beste].type)\|\|prs->words[beste].len <=shortword)))`
`300`	`314`	`{`
`301`		`-bestb=p;`
	`315`	`+bestb=posb;`
`302`	`316`	`beste=pose;`
`303`	`317`	`bestlen=poslen;`
`304`	`318`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitbcec1e6

File tree

1 file changed

1 file changed

`‎contrib/tsearch2/wparser_def.c`

0 commit comments