diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2007-11-25 15:37:11 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2007-11-25 15:37:11 +0000 |
| commit | 3de1f0daac2772d01086ad9a06a428c36648dd02 (patch) | |
| tree | 22403c3390a3c8341c19cfb2b35033c64fde5561 /src/backend | |
| parent | a999ff63ffaece8e612f52e50f1ca658d6628fa0 (diff) | |
| download | postgresql-3de1f0daac2772d01086ad9a06a428c36648dd02.tar.gz postgresql-3de1f0daac2772d01086ad9a06a428c36648dd02.zip | |
Fix XML tag namespace change inadvertantly missed from previous fix. Add
regression test for XML names and numeric entities.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/tsearch/wparser_def.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c index b80175456d2..df32e285f07 100644 --- a/src/backend/tsearch/wparser_def.c +++ b/src/backend/tsearch/wparser_def.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.11 2007/11/20 02:25:22 adunstan Exp $ + * $PostgreSQL: pgsql/src/backend/tsearch/wparser_def.c,v 1.12 2007/11/25 15:37:11 adunstan Exp $ * *------------------------------------------------------------------------- */ @@ -827,7 +827,6 @@ static const TParserStateActionItem actionTPS_InXMLEntity[] = { {p_isalnum, 0, A_NEXT, TPS_InXMLEntity, 0, NULL}, {p_iseqC, ':', A_NEXT, TPS_InXMLEntity, 0, NULL}, {p_iseqC, '_', A_NEXT, TPS_InXMLEntity, 0, NULL}, - {p_iseqC, ':', A_NEXT, TPS_InXMLEntity, 0, NULL}, {p_iseqC, '.', A_NEXT, TPS_InXMLEntity, 0, NULL}, {p_iseqC, '-', A_NEXT, TPS_InXMLEntity, 0, NULL}, {p_iseqC, ';', A_NEXT, TPS_InXMLEntityEnd, 0, NULL}, @@ -871,6 +870,8 @@ static const TParserStateActionItem actionTPS_InTagFirst[] = { {p_iseqC, '!', A_PUSH, TPS_InCommentFirst, 0, NULL}, {p_iseqC, '?', A_PUSH, TPS_InXMLBegin, 0, NULL}, {p_isasclet, 0, A_PUSH, TPS_InTagName, 0, NULL}, + {p_iseqC, ':', A_PUSH, TPS_InTagName, 0, NULL}, + {p_iseqC, '_', A_PUSH, TPS_InTagName, 0, NULL}, {NULL, 0, A_POP, TPS_Null, 0, NULL} }; @@ -894,7 +895,11 @@ static const TParserStateActionItem actionTPS_InTagName[] = { {p_iseqC, '/', A_NEXT, TPS_InTagBeginEnd, 0, NULL}, {p_iseqC, '>', A_NEXT, TPS_InTagEnd, 0, SpecialTags}, {p_isspace, 0, A_NEXT, TPS_InTag, 0, SpecialTags}, - {p_isasclet, 0, A_NEXT, TPS_Null, 0, NULL}, + {p_isalnum, 0, A_NEXT, TPS_Null, 0, NULL}, + {p_iseqC, ':', A_NEXT, TPS_Null, 0, NULL}, + {p_iseqC, '_', A_NEXT, TPS_Null, 0, NULL}, + {p_iseqC, '.', A_NEXT, TPS_Null, 0, NULL}, + {p_iseqC, '-', A_NEXT, TPS_Null, 0, NULL}, {NULL, 0, A_POP, TPS_Null, 0, NULL} }; |