Add check of headline method presence. Per report by Yoshiyuki Asaba

diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index a5ec35ac3cc858eb493ceddc797985a628bacaa8..5e8528b43c8f29e5229258f0625917fca7f0532f 100644 (file)
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *   $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.6 2008/01/01 19:45:52 momjian Exp $
+ *   $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.7 2008/01/15 17:16:01 teodor Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -309,6 +309,11 @@ ts_headline_byid_opt(PG_FUNCTION_ARGS)
    cfg = lookup_ts_config_cache(PG_GETARG_OID(0));
    prsobj = lookup_ts_parser_cache(cfg->prsId);
 
+   if ( !OidIsValid( prsobj->headlineOid ) )
+       ereport(ERROR, 
+               (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+               errmsg("Text parser doesn't support headline creation")));
+
    memset(&prs, 0, sizeof(HeadlineParsedText));
    prs.lenwords = 32;
    prs.words = (HeadlineWordEntry *) palloc(sizeof(HeadlineWordEntry) * prs.lenwords);