in.key = word;
in.keylen = len;
- return SFSFindDataOrSave(info, &in, NULL);
+ return SFSFindDataFromSavedOrSave(info, &in, NULL);
}
void*
SFSFindDataOrSave(SFSTree *info, SFSDataIO *in, SFSTreePosition *position) {
+ if ( position )
+ memset(position, 0, sizeof(position));
+
+ return SFSFindDataFromSavedOrSave(info, in, position);
+}
+
+void*
+SFSFindDataFromSavedOrSave(SFSTree *info, SFSDataIO *in, SFSTreePosition *position) {
SFSNode *node = info->node;
SFSNode **pnode = &(info->node);
SFSNodeData *StopLow, *StopHigh, *StopMiddle;
u_int8_t *ptr =(u_int8_t*)in->key;
- if ( position ) {
- position->nodeptr = NULL;
- position->node = NULL;
- position->level = 0;
+ if ( position && position->nodeptr && position->node && in->keylen > position->level ) {
+ node = position->node;
+ pnode = position->nodeptr;
+ ptr += position->level;
}
while( node && !ISEND(ptr, in->key, in->keylen) ) {
}
if ( node->isskip ) {
- if ( in->keylen>0 && in->keylen - (((char*)ptr) - in->key) > node->nchar )
+ if ( in->keylen>0 && in->keylen - (((char*)ptr) - in->key) < node->nchar )
return NULL;
else if ( STRNCMP(ptr, ((char*)node)+node->dataptr, node->nchar) ) {
ptr+=node->nchar;
else
node = splitSkipNode(info, node, in, level);
} else {
- StopLow = node->data;
+ StopLow = node->data;
StopHigh = StopLow + node->nchar;
while (StopLow < StopHigh) {
StopMiddle = StopLow + ((StopHigh - StopLow) >> 1);
- if ( StopMiddle->val == *ptr ) {
+ if ( StopMiddle->val == *ptr ) {
if ( *(ptr+1)=='\0' ) {
if ( StopMiddle->isword ) {
/* already exists */
return 1;
}
- if ( s == NULL || s->node == NULL)
+ if ( s == NULL )
return 0;
+ if ( s->node == NULL ) {
+ info->stack = s->next;
+ tfree(s);
+ return SFSIterate(info, out);
+ }
while ( s->level + s->node->nchar + 1 >= info->tlen ) {
info->tlen *= 2;