1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

oops forgot to commit ft_parser.c :-[]

Browse Source 
myisam/ft_parser.c:
  oops forgot to commit this file :-[]
This commit is contained in:
unknown 2003-10-20 21:32:49 +02:00
parent 228f4a43a3
commit 293a61ed35
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
myisam/ft_parser.c
View File

@ -83,7 +83,7 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
FT_WORD *word, FTB_PARAM *param) FT_WORD *word, FTB_PARAM *param)
{ {
byte *doc=*start; byte *doc=*start;
int mwc; uint mwc, length;
param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0); param->yesno=(FTB_YES==' ') ? 1 : (param->quot != 0);
param->plusminus=param->pmsign=0; param->plusminus=param->pmsign=0;
@ -120,8 +120,8 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
param->plusminus=param->pmsign=0; param->plusminus=param->pmsign=0;
} }
mwc=0; mwc=length=0;
for (word->pos=doc; doc<end; doc++) for (word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc))
if (true_word_char(cs,*doc)) if (true_word_char(cs,*doc))
mwc=0; mwc=0;
else if (!misc_word_char(*doc) || mwc++) else if (!misc_word_char(*doc) || mwc++)
@ -132,8 +132,8 @@ byte ft_get_word(CHARSET_INFO *cs, byte **start, byte *end,
if ((param->trunc=(doc<end && *doc == FTB_TRUNC))) if ((param->trunc=(doc<end && *doc == FTB_TRUNC)))
doc++; doc++;
if (((word->len >= ft_min_word_len && !is_stopword(word->pos, word->len)) if (((length >= ft_min_word_len && !is_stopword(word->pos, word->len))
|| param->trunc) && word->len < ft_max_word_len) || param->trunc) && length < ft_max_word_len)
{ {
*start=doc; *start=doc;
return 1; return 1;
@ -146,7 +146,7 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
FT_WORD *word) FT_WORD *word)
{ {
byte *doc=*start; byte *doc=*start;
int mwc; uint mwc, length;
DBUG_ENTER("ft_simple_get_word"); DBUG_ENTER("ft_simple_get_word");
while (doc<end) while (doc<end)
@ -156,8 +156,8 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
if (true_word_char(cs,*doc)) break; if (true_word_char(cs,*doc)) break;
} }
mwc=0; mwc=length=0;
for(word->pos=doc; doc<end; doc++) for(word->pos=doc; doc<end; length++, doc+=my_mbcharlen(cs, *(uchar *)doc))
if (true_word_char(cs,*doc)) if (true_word_char(cs,*doc))
mwc=0; mwc=0;
else if (!misc_word_char(*doc) || mwc++) else if (!misc_word_char(*doc) || mwc++)
@ -165,7 +165,7 @@ byte ft_simple_get_word(CHARSET_INFO *cs, byte **start, byte *end,
word->len= (uint)(doc-word->pos) - mwc; word->len= (uint)(doc-word->pos) - mwc;
if (word->len >= ft_min_word_len && word->len < ft_max_word_len && if (length >= ft_min_word_len && length < ft_max_word_len &&
!is_stopword(word->pos, word->len)) !is_stopword(word->pos, word->len))
{ {
*start=doc; *start=doc;