X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=297795c4fe3dfb0db02179297072ec76caeae184;hb=6e17288c2f2ab204c9163df01b95f20cd171e592;hp=63b27e8e8d38b30c1aa7b5d614c7c6951fd8f539;hpb=2cd05dfd682c368fd3bd73912144344d2954325f;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 63b27e8..297795c 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.59 2005-06-06 21:31:08 adam Exp $
+/* $Id: trunc.c,v 1.65 2006-05-10 08:13:22 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -146,6 +146,9 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         struct trunc_info *ti;
         int rscur = 0;
         int rsmax = (to-from)/i_add + 1;
+	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);
@@ -156,13 +159,13 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
                 rset[rscur] = rset_trunc_r(zi, term, length, flags,
 					   isam_p, i, i+i_add,
 					   merge_chunk, preserve_position,
-					   term_type, rset_nmem, 
+					   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, 
+					   term_type, rset_nmem_sub, 
 					   kctrl, scope, 0);
             rscur++;
         }
@@ -194,7 +197,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
                     rset_delete(rset[n]);
                     break;
                 }
-                if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+                if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > cmp_border)
                 {
                     heap_delete(ti);
                     heap_insert(ti, ti->tmpbuf, n);
@@ -205,6 +208,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         xfree(rset);
         xfree(rsfd);
         heap_close(ti);
+	nmem_destroy(rset_nmem_sub);
     }
     else if (zi->reg->isamc)
     {
@@ -400,13 +404,15 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
 		const char *term, int length, const char *flags,
 		int preserve_position, int term_type, NMEM rset_nmem,
 	        struct rset_key_control *kctrl, int scope,
-		struct ord_list *ol)
+		struct ord_list *ol, int reg_type,
+		zint hits_limit, const char *term_ref_id)
 {
     TERMID termid;
     RSET result;
     int trunc_chunk;
     
-    termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol);
+    termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol,
+			      reg_type, hits_limit, term_ref_id);
     if (no < 1)
 	return rsnull_create(rset_nmem, kctrl, termid);
     
@@ -452,10 +458,18 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
         yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
 	return rsnull_create(rset_nmem, kctrl, 0);
     }
-    trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "100"));
+    trunc_chunk = atoi(res_get_def(zi->res, "truncchunk", "20"));
     result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
 			  preserve_position, term_type, rset_nmem, kctrl,
 			  scope, termid);
     return result;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+