Fixes about word with several infiniteve

feodor · feodor · commit baeab89de63a · 2003-11-27T16:04:40.000Z
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
@@ -278,7 +278,7 @@ pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval, int2 we
 		pushval_asis(state, VAL, prs.words[count].word, prs.words[count].len, weight);
 		pfree(prs.words[count].word);
 		if (count)
-			pushquery(state, OPR, (int4) '&', 0, 0, 0);
+			pushquery(state, OPR, (int4) '|', 0, 0, 0);
 	}
 	pfree(prs.words);
 
diff --git a/contrib/tsearch2/tsvector.c b/contrib/tsearch2/tsvector.c
@@ -635,8 +635,10 @@ uniqueWORD(WORD * a, int4 l)
 					res->alen *= 2;
 					res->pos.apos = (uint16 *) repalloc(res->pos.apos, sizeof(uint16) * res->alen);
 				}
-				res->pos.apos[res->pos.apos[0] + 1] = LIMITPOS(ptr->pos.pos);
-				res->pos.apos[0]++;
+				if ( res->pos.apos[0]==0 || res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos) ) { 
+					res->pos.apos[res->pos.apos[0] + 1] = LIMITPOS(ptr->pos.pos);
+					res->pos.apos[0]++;
+				}
 			}
 		}
 		ptr++;

Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ pushval_morph(QPRS_STATE * state, int typeval, char *strval, int lenval, int2 we`
`278`	`278`	`pushval_asis(state, VAL, prs.words[count].word, prs.words[count].len, weight);`
`279`	`279`	`pfree(prs.words[count].word);`
`280`	`280`	`if (count)`
`281`		`- pushquery(state, OPR, (int4) '&', 0, 0, 0);`
	`281`	`+ pushquery(state, OPR, (int4) '\|', 0, 0, 0);`
`282`	`282`	`}`
`283`	`283`	`pfree(prs.words);`
`284`	`284`
Original file line number	Diff line number	Diff line change
`@@ -635,8 +635,10 @@ uniqueWORD(WORD * a, int4 l)`
`635`	`635`	`res->alen *= 2;`
`636`	`636`	`res->pos.apos = (uint16 ) repalloc(res->pos.apos, sizeof(uint16) res->alen);`
`637`	`637`	`}`
`638`		`- res->pos.apos[res->pos.apos[0] + 1] = LIMITPOS(ptr->pos.pos);`
`639`		`- res->pos.apos[0]++;`
	`638`	`+ if ( res->pos.apos[0]==0 \|\| res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos) ) {`
	`639`	`+ res->pos.apos[res->pos.apos[0] + 1] = LIMITPOS(ptr->pos.pos);`
	`640`	`+ res->pos.apos[0]++;`
	`641`	`+ }`
`640`	`642`	`}`
`641`	`643`	`}`
`642`	`644`	`ptr++;`