Index: ft_search_db.c
===================================================================
RCS file: /cvsroot/gift/OpenFT/src/ft_search_db.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- ft_search_db.c      13 Aug 2004 22:49:45 -0000      1.118
+++ ft_search_db.c      21 Aug 2004 21:10:19 -0000      1.119
@@ -279,2 +279,2 @@
        if (!(sdb = MALLOC (sizeof (FTSearchDB))))
                return NULL;

+       sdb->share_idx_name = NULL;
+       sdb->share_idx = NULL;
+       sdb->remove_curs = NULL;
+       sdb->shares = 0;
+       sdb->size = 0;
+
        node->session->search_db = sdb;
        sdb->node = node;

@@ -1007,3 +1014,2 @@
        /* choose a new id, retrying until it succeeds */
        do {
-               id = global_id++;

                /* skip zero */
-               if (!id)
-                       continue;
+               do {
+                       id = global_id++;
+               } while (!id);

                keyrec.sdb = sdb;
                keyrec.id  = id;

Index: ft_search_exec.c
===================================================================
RCS file: /cvsroot/gift/OpenFT/src/ft_search_exec.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- ft_search_exec.c    13 Aug 2004 22:49:45 -0000      1.65
+++ ft_search_exec.c    22 Aug 2004 01:52:40 -0000      1.66
@@ -133,1 +133,1 @@
        }

        /* check main token list */
-       for (i = 0, ptr = sdata->f_qtok->tokens; i < sdata->f_qtok->tokens; i++, ptr++)
+       for (i = 0, ptr = sdata->f_qtok->tokens; i < sdata->f_qtok->len; i++, ptr++)
        {                                                                           
                int matched = FALSE;

@@ -430,1 +430,1 @@
        sw = stopwatch_new (TRUE);