summaryrefslogtreecommitdiff
path: root/src/backend/tsearch
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/tsearch')
-rw-r--r--src/backend/tsearch/dict_thesaurus.c6
-rw-r--r--src/backend/tsearch/ts_parse.c12
-rw-r--r--src/backend/tsearch/ts_selfuncs.c10
-rw-r--r--src/backend/tsearch/wparser_def.c6
4 files changed, 17 insertions, 17 deletions
diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c
index c7097fc666..4befc72989 100644
--- a/src/backend/tsearch/dict_thesaurus.c
+++ b/src/backend/tsearch/dict_thesaurus.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.13 2009/01/01 17:23:48 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.14 2009/07/16 06:33:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -800,7 +800,7 @@ thesaurus_lexize(PG_FUNCTION_ARGS)
if (dstate->isend)
PG_RETURN_POINTER(NULL);
- stored = (LexemeInfo *) dstate->private;
+ stored = (LexemeInfo *) dstate->private_state;
if (stored)
curpos = stored->posinsubst + 1;
@@ -859,7 +859,7 @@ thesaurus_lexize(PG_FUNCTION_ARGS)
info = NULL; /* word isn't recognized */
}
- dstate->private = (void *) info;
+ dstate->private_state = (void *) info;
if (!info)
{
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
index ccafe5f804..f503306aa0 100644
--- a/src/backend/tsearch/ts_parse.c
+++ b/src/backend/tsearch/ts_parse.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.12 2009/06/11 14:49:03 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.13 2009/07/16 06:33:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -204,7 +204,7 @@ LexizeExec(LexizeData *ld, ParsedLex **correspondLexem)
dict = lookup_ts_dictionary_cache(map->dictIds[i]);
ld->dictState.isend = ld->dictState.getnext = false;
- ld->dictState.private = NULL;
+ ld->dictState.private_state = NULL;
res = (TSLexeme *) DatumGetPointer(FunctionCall4(
&(dict->lexize),
PointerGetDatum(dict->dictData),
@@ -464,18 +464,18 @@ hlfinditem(HeadlineParsedText *prs, TSQuery query, char *buf, int buflen)
for (i = 0; i < query->size; i++)
{
if (item->type == QI_VAL &&
- tsCompareString(GETOPERAND(query) + item->operand.distance, item->operand.length,
- buf, buflen, item->operand.prefix) == 0)
+ tsCompareString(GETOPERAND(query) + item->qoperand.distance, item->qoperand.length,
+ buf, buflen, item->qoperand.prefix) == 0)
{
if (word->item)
{
memcpy(&(prs->words[prs->curwords]), word, sizeof(HeadlineWordEntry));
- prs->words[prs->curwords].item = &item->operand;
+ prs->words[prs->curwords].item = &item->qoperand;
prs->words[prs->curwords].repeated = 1;
prs->curwords++;
}
else
- word->item = &item->operand;
+ word->item = &item->qoperand;
}
item++;
}
diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c
index d0ffb0c773..c0e7012b6a 100644
--- a/src/backend/tsearch/ts_selfuncs.c
+++ b/src/backend/tsearch/ts_selfuncs.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tsearch/ts_selfuncs.c,v 1.4 2009/06/11 14:49:03 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/tsearch/ts_selfuncs.c,v 1.5 2009/07/16 06:33:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -307,7 +307,7 @@ tsquery_opr_selec(QueryItem *item, char *operand,
}
/* Current TSQuery node is an operator */
- switch (item->operator.oper)
+ switch (item->qoperator.oper)
{
case OP_NOT:
selec = 1.0 - tsquery_opr_selec(item + 1, operand,
@@ -317,7 +317,7 @@ tsquery_opr_selec(QueryItem *item, char *operand,
case OP_AND:
s1 = tsquery_opr_selec(item + 1, operand,
lookup, length, minfreq);
- s2 = tsquery_opr_selec(item + item->operator.left, operand,
+ s2 = tsquery_opr_selec(item + item->qoperator.left, operand,
lookup, length, minfreq);
selec = s1 * s2;
break;
@@ -325,13 +325,13 @@ tsquery_opr_selec(QueryItem *item, char *operand,
case OP_OR:
s1 = tsquery_opr_selec(item + 1, operand,
lookup, length, minfreq);
- s2 = tsquery_opr_selec(item + item->operator.left, operand,
+ s2 = tsquery_opr_selec(item + item->qoperator.left, operand,
lookup, length, minfreq);
selec = s1 + s2 - s1 * s2;
break;
default:
- elog(ERROR, "unrecognized operator: %d", item->operator.oper);
+ elog(ERROR, "unrecognized operator: %d", item->qoperator.oper);
selec = 0; /* keep compiler quiet */
break;
}
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index d7d72afddd..3d3409dac6 100644
--- a/src/backend/tsearch/wparser_def.c
+++ b/src/backend/tsearch/wparser_def.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.23 2009/03/11 16:03:40 teodor Exp $
+ * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.24 2009/07/16 06:33:44 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -1950,7 +1950,7 @@ hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q)
}
for (i = pos; i < prs->curwords; i++)
{
- if (prs->words[i].item == &item->operand)
+ if (prs->words[i].item == &item->qoperand)
{
if (i > *q)
*q = i;
@@ -1973,7 +1973,7 @@ hlCover(HeadlineParsedText *prs, TSQuery query, int *p, int *q)
}
for (i = *q; i >= pos; i--)
{
- if (prs->words[i].item == &item->operand)
+ if (prs->words[i].item == &item->qoperand)
{
if (i < *p)
*p = i;
View Lorry Controller Status