Removed some FIXMEs. Mostly comments on things that had already been fixed.

diff --git a/index/trunc.c b/index/trunc.c
index 3a954e1..391a64e 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.42 2004-09-01 15:01:32 heikki Exp $
+/* $Id: trunc.c,v 1.43 2004-09-03 14:59:49 heikki Exp $

    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 

@@ -420,21 +420,6 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
         if (no == 1)
             return rsisamc_create(rset_nmem, kctrl,
                     zi->reg->isamc, *isam_p);
         if (no == 1)
             return rsisamc_create(rset_nmem, kctrl,
                     zi->reg->isamc, *isam_p);

-
-#if 0 /* NEW_TRUNC */ /* FIXME - Use the new multi_or instead !! */
-        else if (no < 10000)
-        {
-            rset_m_or_parms parms;
-
-            parms.key_size = sizeof(struct it_key);
-            parms.cmp = key_compare_it;
-            parms.isc = zi->reg->isamc;
-            parms.isam_positions = isam_p;
-            parms.no_isam_positions = no;
-            parms.no_save_positions = 100000;
-            return rset_create (rset_kind_m_or, &parms);
-        }
-#endif

         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else if (zi->reg->isamb)
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else if (zi->reg->isamb)

diff --git a/index/zebraapi.c b/index/zebraapi.c
index 0185da1..3d9d89f 100644 (file)
--- a/index/zebraapi.c
+++ b/index/zebraapi.c
@@ -1,4 +1,4 @@
-/* $Id: zebraapi.c,v 1.127 2004-08-25 09:23:36 adam Exp $
+/* $Id: zebraapi.c,v 1.128 2004-09-03 14:59:49 heikki Exp $

    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 

@@ -2059,7 +2059,6 @@ int zebra_search_PQF (ZebraHandle zh, const char *pqf_query,
 
 /* ---------------------------------------------------------------------------
   Sort - a simplified interface, with optional read locks.
 
 /* ---------------------------------------------------------------------------
   Sort - a simplified interface, with optional read locks.

-  FIXME - This is a horrible name, will conflict with half the applications

 */
 int zebra_sort_by_specstr (ZebraHandle zh, 
                           ODR stream,
 */
 int zebra_sort_by_specstr (ZebraHandle zh, 
                           ODR stream,

diff --git a/isamb/isamb.c b/isamb/isamb.c
index 57ca28a..9ee3596 100644 (file)
--- a/isamb/isamb.c
+++ b/isamb/isamb.c
@@ -1,4 +1,4 @@
-/* $Id: isamb.c,v 1.56 2004-08-23 13:06:46 adam Exp $
+/* $Id: isamb.c,v 1.57 2004-09-03 14:59:49 heikki Exp $

    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 

@@ -1991,8 +1991,6 @@ again:
 void isamb_pp_pos( ISAMB_PP pp, double *current, double *total )
 { /* return an estimate of the current position and of the total number of */
   /* occureences in the isam tree, based on the current leaf */
 void isamb_pp_pos( ISAMB_PP pp, double *current, double *total )
 { /* return an estimate of the current position and of the total number of */
   /* occureences in the isam tree, based on the current leaf */

-       /* FIXME - Isam-B ought to know how many we have, so we could return */
-       /* that directly */

     struct ISAMB_block *p = pp->block[pp->level];
     assert(total);
     assert(current);
     struct ISAMB_block *p = pp->block[pp->level];
     assert(total);
     assert(current);

@@ -2000,7 +1998,6 @@ void isamb_pp_pos( ISAMB_PP pp, double *current, double *total )
 
     *total = pp->block[0]->no_items;
     *current = (double) pp->returned_numbers;
 
     *total = pp->block[0]->no_items;
     *current = (double) pp->returned_numbers;

-    /* use the precise number, since we have it! */

 #if ISAMB_DEBUG
     logf(LOG_LOG, "isamb_pp_pos returning: cur= %0.1f tot=%0.1f rn="
         ZINT_FORMAT, *current, *total, pp->returned_numbers);
 #if ISAMB_DEBUG
     logf(LOG_LOG, "isamb_pp_pos returning: cur= %0.1f tot=%0.1f rn="
         ZINT_FORMAT, *current, *total, pp->returned_numbers);

diff --git a/rset/rset.c b/rset/rset.c
index a118ee5..6f7c342 100644 (file)
--- a/rset/rset.c
+++ b/rset/rset.c
@@ -1,4 +1,4 @@
-/* $Id: rset.c,v 1.31 2004-09-01 15:01:32 heikki Exp $
+/* $Id: rset.c,v 1.32 2004-09-03 14:59:50 heikki Exp $

    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 

@@ -69,8 +69,6 @@ void rfd_delete_base(RSFD rfd)
 
 RSET rset_create_base(const struct rset_control *sel, 
                       NMEM nmem, const struct key_control *kcontrol)
 
 RSET rset_create_base(const struct rset_control *sel, 
                       NMEM nmem, const struct key_control *kcontrol)

-        /* FIXME - Add keysize and cmp function */
-        /* FIXME - Add a general key-func block for cmp, dump, etc */

 {
     RSET rnew;
     NMEM M;
 {
     RSET rnew;
     NMEM M;

@@ -91,7 +89,6 @@ RSET rset_create_base(const struct rset_control *sel,
     rnew->priv = 0;
     rnew->free_list=NULL;
     rnew->keycontrol=kcontrol;
     rnew->priv = 0;
     rnew->free_list=NULL;
     rnew->keycontrol=kcontrol;

-    

     return rnew;
 }
 
     return rnew;
 }