X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Ftrunc.c;h=eb81fbbed48be025cf122f65300675abb510f497;hp=9fb58546cdb9a7f869767784ae592c8bfe2a64b7;hb=354f1142c4cc8c59b6f1170b95caec40bfe4d8c0;hpb=f82c996895d8dcd69e987660ebf9fdaafdba35b0

diff --git a/index/trunc.c b/index/trunc.c
index 9fb5854..eb81fbb 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,8 +1,5 @@
-/* $Id: trunc.c,v 1.70 2007-12-03 13:04:04 adam Exp $
-   Copyright (C) 1995-2007
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -21,6 +18,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 
@@ -149,27 +149,27 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
 	int cmp_border = preserve_position ? 0 : 1;
 	NMEM rset_nmem_sub = nmem_create(); /* all sub rsets not needed
 					       after this */
-        
+
         rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
         rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
-        
+
         for (i = from; i < to; i += i_add)
         {
             if (i_add <= to - i)
                 rset[rscur] = rset_trunc_r(zi, term, length, flags,
 					   isam_p, i, i+i_add,
 					   merge_chunk, preserve_position,
-					   term_type, rset_nmem_sub, 
+					   term_type, rset_nmem_sub,
 					   kctrl, scope, 0);
             else
                 rset[rscur] = rset_trunc_r(zi, term, length, flags,
 					   isam_p, i, to,
 					   merge_chunk, preserve_position,
-					   term_type, rset_nmem_sub, 
+					   term_type, rset_nmem_sub,
 					   kctrl, scope, 0);
             rscur++;
         }
-        ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
+        ti = heap_init (rscur, sizeof(struct it_key), key_compare);
         for (i = rscur; --i >= 0; )
         {
             rsfd[i] = rset_open(rset[i], RSETF_READ);
@@ -219,7 +219,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         ispt = (ISAMC_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init(to-from, sizeof(struct it_key),
-		       key_compare_it);
+		       key_compare);
         for (i = to-from; --i >= 0; )
         {
             ispt[i] = isamc_pp_open(zi->reg->isamc, isam_p[from+i]);
@@ -274,7 +274,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init(to-from, sizeof(struct it_key),
-		       key_compare_it);
+		       key_compare);
         for (i = to-from; --i >= 0; )
         {
             ispt[i] = isams_pp_open(zi->reg->isams, isam_p[from+i]);
@@ -317,7 +317,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         ispt = (ISAMB_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init(to-from, sizeof(struct it_key),
-		       key_compare_it);
+		       key_compare);
         for (i = to-from; --i >= 0; )
         {
 	    if (isam_p[from+i]) {
@@ -414,7 +414,7 @@ RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
 
     termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol,
 			      *index_type, hits_limit, term_ref_id);
-    
+
     if (no < 1)
 	return rset_create_null(rset_nmem, kctrl, termid);
     else if (no == 1)
@@ -448,6 +448,7 @@ RSET rset_trunc(ZebraHandle zh, ISAM_P *isam_p, int no,
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab