X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=297795c4fe3dfb0db02179297072ec76caeae184;hb=9ceac3e96fe083b93b6fd4a676003dd10482e465;hp=0a018292e6277695b30f828e045a167eb3c8d193;hpb=008d2cf0f073cb1e77fe14db18ce07e0c3b5d176;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 0a01829..297795c 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.54 2005-04-20 10:15:19 adam Exp $
+/* $Id: trunc.c,v 1.65 2006-05-10 08:13:22 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -127,7 +127,7 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
                          const char *flags, ISAM_P *isam_p, int from, int to,
 			 int merge_chunk, int preserve_position,
 			 int term_type, NMEM rset_nmem,
-			 const struct key_control *kctrl, int scope,
+			 struct rset_key_control *kctrl, int scope,
 			 TERMID termid)
 {
     RSET result;
@@ -137,7 +137,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
     result = rstemp_create(rset_nmem, kctrl, scope,
 			   res_get(zi->res, "setTmpDir"), termid);
     result_rsfd = rset_open(result, RSETF_WRITE);
-    yaz_log(YLOG_LOG, "rset_trunc_r from=%d to=%d result=%p", from, to, result);
 
     if (to - from > merge_chunk)
     {
@@ -147,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);
@@ -157,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++;
         }
@@ -195,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);
@@ -206,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)
     {
@@ -366,7 +369,6 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
         yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc_r");
 
     rset_close(result_rsfd);
-    yaz_log(YLOG_LOG, "rset_trunc_r returned result=%p", result);
     return result;
 }
 
@@ -401,15 +403,19 @@ static int isamc_trunc_cmp(const void *p1, const void *p2)
 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,
-		const struct key_control *kctrl, int scope)
+	        struct rset_key_control *kctrl, int scope,
+		struct ord_list *ol, int reg_type,
+		zint hits_limit, const char *term_ref_id)
 {
     TERMID termid;
     RSET result;
     int trunc_chunk;
-    yaz_log(YLOG_LOG, "rset_trunc no=%d", no);
+    
+    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 = rset_term_create(term, length, flags, term_type,rset_nmem);
+	return rsnull_create(rset_nmem, kctrl, termid);
+    
     if (zi->reg->isams)
     {
         if (no == 1)
@@ -428,7 +434,7 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
     {
 	int trunc_limit = atoi(res_get_def(zi->res, "trunclimit", "10000"));
         if (no == 1)
-            return rsisamb_create(rset_nmem,kctrl, scope,
+            return rsisamb_create(rset_nmem, kctrl, scope,
 				  zi->reg->isamb, *isam_p, termid);
         else if (no < trunc_limit) 
         {
@@ -437,24 +443,33 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
             int i;
             for (i = 0; i<no; i++)
                 rsets[i] = rsisamb_create(rset_nmem, kctrl, scope,
-					  zi->reg->isamb, isam_p[i], termid);
-            r = rsmulti_or_create( rset_nmem, kctrl, scope, no, rsets);
+					  zi->reg->isamb, isam_p[i],
+					  0 /* termid */);
+            r = rsmulti_or_create(rset_nmem, kctrl, scope,
+				  termid /* termid */,
+				  no, rsets);
             xfree(rsets);
             return r;
         } 
-	fprintf(stderr, "Using rset_trunc_r limit=%d\n", trunc_limit);
         qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else
     {
         yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
-	return rsnull_create(rset_nmem, kctrl);
+	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);
-    yaz_log(YLOG_LOG, "rset_trunc no=%d returned=%p", no, result);
+			  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
+ */
+