diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/tsearch/dict_simple.c | 39 |
1 files changed, 33 insertions, 6 deletions
diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c index aea2c0963b1..8248d3987d6 100644 --- a/src/backend/tsearch/dict_simple.c +++ b/src/backend/tsearch/dict_simple.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/dict_simple.c,v 1.3 2007/08/25 00:03:59 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/dict_simple.c,v 1.4 2007/11/14 18:36:37 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -23,6 +23,7 @@ typedef struct { StopList stoplist; + bool accept; } DictSimple; @@ -31,9 +32,12 @@ dsimple_init(PG_FUNCTION_ARGS) { List *dictoptions = (List *) PG_GETARG_POINTER(0); DictSimple *d = (DictSimple *) palloc0(sizeof(DictSimple)); - bool stoploaded = false; + bool stoploaded = false, + acceptloaded = false; ListCell *l; + d->accept = true; /* default */ + foreach(l, dictoptions) { DefElem *defel = (DefElem *) lfirst(l); @@ -47,6 +51,15 @@ dsimple_init(PG_FUNCTION_ARGS) readstoplist(defGetString(defel), &d->stoplist, lowerstr); stoploaded = true; } + else if (pg_strcasecmp("Accept", defel->defname) == 0) + { + if (acceptloaded) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("multiple Accept parameters"))); + d->accept = defGetBoolean(defel); + acceptloaded = true; + } else { ereport(ERROR, @@ -66,14 +79,28 @@ dsimple_lexize(PG_FUNCTION_ARGS) char *in = (char *) PG_GETARG_POINTER(1); int32 len = PG_GETARG_INT32(2); char *txt; - TSLexeme *res = palloc0(sizeof(TSLexeme) * 2); + TSLexeme *res; txt = lowerstr_with_len(in, len); if (*txt == '\0' || searchstoplist(&(d->stoplist), txt)) + { + /* reject as stopword */ pfree(txt); - else + res = palloc0(sizeof(TSLexeme) * 2); + PG_RETURN_POINTER(res); + } + else if (d->accept) + { + /* accept */ + res = palloc0(sizeof(TSLexeme) * 2); res[0].lexeme = txt; - - PG_RETURN_POINTER(res); + PG_RETURN_POINTER(res); + } + else + { + /* report as unrecognized */ + pfree(txt); + PG_RETURN_POINTER(NULL); + } } |