Add check of headline method presence. Per report by Yoshiyuki Asaba <y-asaba@sraoss.co.jp>

feodor · feodor · commit f7807f1de8c9 · 2008-01-15T17:16:01.000Z
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.6 2008/01/01 19:45:52 momjian Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/tsearch/wparser.c,v 1.7 2008/01/15 17:16:01 teodor Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -309,6 +309,11 @@ ts_headline_byid_opt(PG_FUNCTION_ARGS)`
`309`	`309`	`cfg = lookup_ts_config_cache(PG_GETARG_OID(0));`
`310`	`310`	`prsobj = lookup_ts_parser_cache(cfg->prsId);`
`311`	`311`
	`312`	`+ if ( !OidIsValid( prsobj->headlineOid ) )`
	`313`	`+ ereport(ERROR,`
	`314`	`+ (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),`
	`315`	`+ errmsg("Text parser doesn't support headline creation")));`
	`316`	`+`
`312`	`317`	`memset(&prs, 0, sizeof(HeadlineParsedText));`
`313`	`318`	`prs.lenwords = 32;`
`314`	`319`	`prs.words = (HeadlineWordEntry ) palloc(sizeof(HeadlineWordEntry) prs.lenwords);`