Fix URL generation in headline. Only tag lexeme will be replaced by space.

Per http://archives.postgresql.org/pgsql-bugs/2008-12/msg00013.php

diff --git a/contrib/tsearch2/ts_cfg.c b/contrib/tsearch2/ts_cfg.c
index 2a5fbbf5006225cc1ce04bc56a8c3866067da249..ccca8c5bf9f64085b6931fb11d1be3661f611662 100644 (file)
--- a/contrib/tsearch2/ts_cfg.c
+++ b/contrib/tsearch2/ts_cfg.c
@@ -508,7 +508,7 @@ genhl(HLPRSTEXT * prs)
                                *ptr = ' ';
                                ptr++;
                        }
-                       else
+                       else if (!wrd->skip)
                        {
                                if (wrd->selected)
                                {

diff --git a/contrib/tsearch2/wparser_def.c b/contrib/tsearch2/wparser_def.c
index 53199992c8e205c958f8b27edde1573784f682cd..29b3ca09b75eafd093503c098bca321c9acc4884 100644 (file)
--- a/contrib/tsearch2/wparser_def.c
+++ b/contrib/tsearch2/wparser_def.c
@@ -77,8 +77,9 @@ prsd_end(PG_FUNCTION_ARGS)
 
 
 #define IDIGNORE(x) ( (x)==13 || (x)==14 || (x)==12 || (x)==23 )
-#define HLIDIGNORE(x) ( (x)==5 || (x)==13 || (x)==15 || (x)==16 || (x)==17 )
-#define NONWORDTOKEN(x) ( (x)==12 || HLIDIGNORE(x) )
+#define HLIDREPLACE(x)  ( (x)==13 )
+#define HLIDSKIP(x)     ( (x)==5 || (x)==15 || (x)==16 || (x)==17 )
+#define NONWORDTOKEN(x) ( (x)==12 || HLIDREPLACE(x) || HLIDSKIP(x) )
 #define NOENDTOKEN(x)  ( NONWORDTOKEN(x) || (x)==7 || (x)==8 || (x)==20 || (x)==21 || (x)==22 || IDIGNORE(x) )
 
 typedef struct
@@ -342,8 +343,10 @@ prsd_headline(PG_FUNCTION_ARGS)
                        prs->words[i].selected = 1;
                if (prs->words[i].repeated)
                        prs->words[i].skip = 1;
-               if (HLIDIGNORE(prs->words[i].type))
+               if (HLIDREPLACE(prs->words[i].type))
                        prs->words[i].replace = 1;
+               if (HLIDSKIP(prs->words[i].type))
+                       prs->words[i].skip = 1;
 
                prs->words[i].in = 1;
        }