From baeab89de63ab0f74266481954ee3c0825714ff3 Mon Sep 17 00:00:00 2001
From: Teodor Sigaev <teodor@sigaev.ru>
Date: Thu, 27 Nov 2003 16:04:40 +0000
Subject: [PATCH] Fixes about word with several infiniteve
---
contrib/tsearch2/query.c | 2 +-
contrib/tsearch2/tsvector.c | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/tsearch2/query.c b/contrib/tsearch2/query.c
index 458c55de279..c812f48b0d6 100644
--- 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
index c8002c0ab3f..ea50421eb73 100644
--- 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++;
--
GitLab