|
7 | 7 | *
|
8 | 8 | *
|
9 | 9 | * IDENTIFICATION
|
10 |
| - * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.4 2007/09/18 15:03:23 teodor Exp $ |
| 10 | + * $PostgreSQL: pgsql/src/backend/tsearch/dict_thesaurus.c,v 1.5 2007/11/09 01:32:22 momjian Exp $ |
11 | 11 | *
|
12 | 12 | *-------------------------------------------------------------------------
|
13 | 13 | */
|
@@ -418,14 +418,13 @@ compileTheLexeme(DictThesaurus * d)
|
418 | 418 | Int32GetDatum(strlen(d->wrds[i].lexeme)),
|
419 | 419 | PointerGetDatum(NULL)));
|
420 | 420 |
|
421 |
| -if (!(ptr&&ptr->lexeme)) |
| 421 | +if (!ptr) |
| 422 | +elog(ERROR,"thesaurus word-sample \"%s\" isn't recognized by subdictionary (rule %d)", |
| 423 | +d->wrds[i].lexeme,d->wrds[i].entries->idsubst+1); |
| 424 | +elseif (!(ptr->lexeme)) |
422 | 425 | {
|
423 |
| -if (!ptr) |
424 |
| -elog(ERROR,"thesaurus word-sample \"%s\" isn't recognized by subdictionary (rule %d)", |
425 |
| -d->wrds[i].lexeme,d->wrds[i].entries->idsubst+1); |
426 |
| -else |
427 |
| -elog(NOTICE,"thesaurus word-sample \"%s\" is recognized as stop-word, assign any stop-word (rule %d)", |
428 |
| -d->wrds[i].lexeme,d->wrds[i].entries->idsubst+1); |
| 426 | +elog(NOTICE,"thesaurus word-sample \"%s\" is recognized as stop-word, assign any stop-word (rule %d)", |
| 427 | +d->wrds[i].lexeme,d->wrds[i].entries->idsubst+1); |
429 | 428 |
|
430 | 429 | newwrds=addCompiledLexeme(newwrds,&nnw,&tnm,NULL,d->wrds[i].entries,0);
|
431 | 430 | }
|
|