diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-28 21:56:30 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2007-11-28 21:56:30 +0000 |
| commit | bb0e3011f8670cefc7b4ef667d890c9adb7556db (patch) | |
| tree | 26d5f01629043b8552c669f4fd05bde13919f1ba /src/backend/tsearch/ts_parse.c | |
| parent | 664782ee74ce5c02a35f22543451f957a84f043c (diff) | |
| download | postgresql-bb0e3011f8670cefc7b4ef667d890c9adb7556db.tar.gz postgresql-bb0e3011f8670cefc7b4ef667d890c9adb7556db.zip | |
Make a cleanup pass over error reports in tsearch code. Use ereport
for user-facing errors, fix some poor choices of errcode, adhere to
message style guide.
Diffstat (limited to 'src/backend/tsearch/ts_parse.c')
| -rw-r--r-- | src/backend/tsearch/ts_parse.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c index ef54af3935f..53ea6010d27 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.5 2007/11/15 22:25:16 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.6 2007/11/28 21:56:30 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -380,15 +380,17 @@ parsetext(Oid cfgId, ParsedText *prs, char *buf, int buflen) { #ifdef IGNORE_LONGLEXEME ereport(NOTICE, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("word is too long to be indexed"), errdetail("Words longer than %d characters are ignored.", MAXSTRLEN))); continue; #else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("word is too long to be indexed"))); + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("word is too long to be indexed"), + errdetail("Words longer than %d characters are ignored.", + MAXSTRLEN))); #endif } @@ -547,15 +549,17 @@ hlparsetext(Oid cfgId, HeadlineParsedText *prs, TSQuery query, char *buf, int bu { #ifdef IGNORE_LONGLEXEME ereport(NOTICE, - (errcode(ERRCODE_SYNTAX_ERROR), + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("word is too long to be indexed"), errdetail("Words longer than %d characters are ignored.", MAXSTRLEN))); continue; #else ereport(ERROR, - (errcode(ERRCODE_SYNTAX_ERROR), - errmsg("word is too long to be indexed"))); + (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), + errmsg("word is too long to be indexed"), + errdetail("Words longer than %d characters are ignored.", + MAXSTRLEN))); #endif } |