Index: src/backend/tsearch/wparser_def.c
===================================================================
RCS file: /cvsroot/pgsql/src/backend/tsearch/wparser_def.c,v
retrieving revision 1.29
diff -c -r1.29 wparser_def.c
*** src/backend/tsearch/wparser_def.c	26 Apr 2010 17:10:18 -0000	1.29
--- src/backend/tsearch/wparser_def.c	27 Apr 2010 03:27:08 -0000
***************
*** 707,715 ****
  	int			res = 0;
  
  	tmpprs->state = newTParserPosition(tmpprs->state);
! 	tmpprs->state->state = TPS_InFileFirst;
  
! 	if (TParserGet(tmpprs) && (tmpprs->type == URLPATH || tmpprs->type == FILEPATH))
  	{
  		prs->state->posbyte += tmpprs->lenbytetoken;
  		prs->state->poschar += tmpprs->lenchartoken;
--- 707,715 ----
  	int			res = 0;
  
  	tmpprs->state = newTParserPosition(tmpprs->state);
! 	tmpprs->state->state = TPS_InURLPathFirst;
  
! 	if (TParserGet(tmpprs) && tmpprs->type == URLPATH)
  	{
  		prs->state->posbyte += tmpprs->lenbytetoken;
  		prs->state->poschar += tmpprs->lenchartoken;
***************
*** 1441,1447 ****
  	{p_isdigit, 0, A_NEXT, TPS_InFile, 0, NULL},
  	{p_iseqC, '.', A_NEXT, TPS_InPathFirst, 0, NULL},
  	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
- 	{p_iseqC, '?', A_PUSH, TPS_InURLPathFirst, 0, NULL},
  	{p_iseqC, '~', A_PUSH, TPS_InFileTwiddle, 0, NULL},
  	{NULL, 0, A_POP, TPS_Null, 0, NULL}
  };
--- 1441,1446 ----
***************
*** 1488,1494 ****
  	{p_iseqC, '_', A_NEXT, TPS_InFile, 0, NULL},
  	{p_iseqC, '-', A_NEXT, TPS_InFile, 0, NULL},
  	{p_iseqC, '/', A_PUSH, TPS_InFileFirst, 0, NULL},
- 	{p_iseqC, '?', A_PUSH, TPS_InURLPathFirst, 0, NULL},
  	{NULL, 0, A_BINGO, TPS_Base, FILEPATH, NULL}
  };
  
--- 1487,1492 ----
***************
*** 1504,1510 ****
  	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
  	{p_iseqC, '"', A_POP, TPS_Null, 0, NULL},
  	{p_iseqC, '\'', A_POP, TPS_Null, 0, NULL},
! 	{p_isnotspace, 0, A_CLEAR, TPS_InURLPath, 0, NULL},
  	{NULL, 0, A_POP, TPS_Null, 0, NULL},
  };
  
--- 1502,1510 ----
  	{p_isEOF, 0, A_POP, TPS_Null, 0, NULL},
  	{p_iseqC, '"', A_POP, TPS_Null, 0, NULL},
  	{p_iseqC, '\'', A_POP, TPS_Null, 0, NULL},
! 	{p_iseqC, '<', A_POP, TPS_Null, 0, NULL},
! 	{p_iseqC, '>', A_POP, TPS_Null, 0, NULL},
! 	{p_isnotspace, 0, A_NEXT, TPS_InURLPath, 0, NULL},
  	{NULL, 0, A_POP, TPS_Null, 0, NULL},
  };
  
***************
*** 1516,1521 ****
--- 1516,1523 ----
  	{p_isEOF, 0, A_BINGO, TPS_Base, URLPATH, NULL},
  	{p_iseqC, '"', A_BINGO, TPS_Base, URLPATH, NULL},
  	{p_iseqC, '\'', A_BINGO, TPS_Base, URLPATH, NULL},
+ 	{p_iseqC, '<', A_BINGO, TPS_Base, URLPATH, NULL},
+ 	{p_iseqC, '>', A_BINGO, TPS_Base, URLPATH, NULL},
  	{p_isnotspace, 0, A_NEXT, TPS_InURLPath, 0, NULL},
  	{NULL, 0, A_BINGO, TPS_Base, URLPATH, NULL}
  };
