|
|
|
@ -581,7 +581,12 @@ compareWORD(const void *a, const void *b) |
|
|
|
((TSWORD *) b)->len); |
|
|
|
((TSWORD *) b)->len); |
|
|
|
|
|
|
|
|
|
|
|
if (res == 0) |
|
|
|
if (res == 0) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if ( ((TSWORD *) a)->pos.pos == ((TSWORD *) b)->pos.pos ) |
|
|
|
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
|
|
return (((TSWORD *) a)->pos.pos > ((TSWORD *) b)->pos.pos) ? 1 : -1; |
|
|
|
return (((TSWORD *) a)->pos.pos > ((TSWORD *) b)->pos.pos) ? 1 : -1; |
|
|
|
|
|
|
|
} |
|
|
|
return res; |
|
|
|
return res; |
|
|
|
} |
|
|
|
} |
|
|
|
return (((TSWORD *) a)->len > ((TSWORD *) b)->len) ? 1 : -1; |
|
|
|
return (((TSWORD *) a)->len > ((TSWORD *) b)->len) ? 1 : -1; |
|
|
|
@ -631,7 +636,8 @@ uniqueWORD(TSWORD * a, int4 l) |
|
|
|
else |
|
|
|
else |
|
|
|
{ |
|
|
|
{ |
|
|
|
pfree(ptr->word); |
|
|
|
pfree(ptr->word); |
|
|
|
if (res->pos.apos[0] < MAXNUMPOS - 1 && res->pos.apos[res->pos.apos[0]] != MAXENTRYPOS - 1) |
|
|
|
if (res->pos.apos[0] < MAXNUMPOS - 1 && res->pos.apos[res->pos.apos[0]] != MAXENTRYPOS - 1 && |
|
|
|
|
|
|
|
res->pos.apos[res->pos.apos[0]] != LIMITPOS(ptr->pos.pos) ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if (res->pos.apos[0] + 1 >= res->alen) |
|
|
|
if (res->pos.apos[0] + 1 >= res->alen) |
|
|
|
{ |
|
|
|
{ |
|
|
|
|