X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=f64f12bf6d552e1f8a6b5bb4819bfa0a4b4522e6;hb=174ad2c7bbf2b7312ac080de2fd85d0509a55404;hp=3a954e16a395d67ec8f781e9c4b2a537c4e23d52;hpb=56131846f59919027a4d3c59efb485afb6efb0de;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 3a954e1..f64f12b 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,6 +1,6 @@
-/* $Id: trunc.c,v 1.42 2004-09-01 15:01:32 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: trunc.c,v 1.51 2005-01-15 20:47:15 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -91,19 +91,19 @@ static struct trunc_info *heap_init (int size, int key_size,
 				     int (*cmp)(const void *p1,
 						const void *p2))
 {
-    struct trunc_info *ti = (struct trunc_info *) xmalloc (sizeof(*ti));
+    struct trunc_info *ti = (struct trunc_info *) xmalloc(sizeof(*ti));
     int i;
 
     ++size;
     ti->heapnum = 0;
     ti->keysize = key_size;
     ti->cmp = cmp;
-    ti->indx = (int *) xmalloc (size * sizeof(*ti->indx));
-    ti->heap = (char **) xmalloc (size * sizeof(*ti->heap));
-    ti->ptr = (int *) xmalloc (size * sizeof(*ti->ptr));
-    ti->swapbuf = (char *) xmalloc (ti->keysize);
-    ti->tmpbuf = (char *) xmalloc (ti->keysize);
-    ti->buf = (char *) xmalloc (size * ti->keysize);
+    ti->indx = (int *) xmalloc(size * sizeof(*ti->indx));
+    ti->heap = (char **) xmalloc(size * sizeof(*ti->heap));
+    ti->ptr = (int *) xmalloc(size * sizeof(*ti->ptr));
+    ti->swapbuf = (char *) xmalloc(ti->keysize);
+    ti->tmpbuf = (char *) xmalloc(ti->keysize);
+    ti->buf = (char *) xmalloc(size * ti->keysize);
     for (i = size; --i >= 0; )
     {
         ti->ptr[i] = i;
@@ -114,20 +114,21 @@ static struct trunc_info *heap_init (int size, int key_size,
 
 static void heap_close (struct trunc_info *ti)
 {
-    xfree (ti->ptr);
-    xfree (ti->indx);
-    xfree (ti->heap);
-    xfree (ti->swapbuf);
-    xfree (ti->tmpbuf);
-    xfree (ti->buf);
-    xfree (ti);
+    xfree(ti->ptr);
+    xfree(ti->indx);
+    xfree(ti->heap);
+    xfree(ti->swapbuf);
+    xfree(ti->tmpbuf);
+    xfree(ti->buf);
+    xfree(ti);
 }
 
 static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                           const char *flags, ISAMS_P *isam_p, int from, int to,
                           int merge_chunk, int preserve_position,
                           int term_type, NMEM rset_nmem,
-                          const struct key_control *kctrl)
+                          const struct key_control *kctrl, int scope,
+                          TERMID termid)
 {
     RSET result; 
     RSFD result_rsfd;
@@ -140,8 +141,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
     parms.temp_path = res_get (zi->res, "setTmpDir");
     result = rset_create (rset_kind_temp, &parms);
     */
-    result=rstemp_create( rset_nmem,kctrl,
-            res_get (zi->res, "setTmpDir"));
+    result = rstemp_create( rset_nmem,kctrl, scope,
+            res_get (zi->res, "setTmpDir"), termid);
     result_rsfd = rset_open (result, RSETF_WRITE);
 
     if (to - from > merge_chunk)
@@ -153,8 +154,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         int rscur = 0;
         int rsmax = (to-from)/i_add + 1;
         
-        rset = (RSET *) xmalloc (sizeof(*rset) * rsmax);
-        rsfd = (RSFD *) xmalloc (sizeof(*rsfd) * rsmax);
+        rset = (RSET *) xmalloc(sizeof(*rset) * rsmax);
+        rsfd = (RSFD *) xmalloc(sizeof(*rsfd) * rsmax);
         
         for (i = from; i < to; i += i_add)
         {
@@ -162,19 +163,21 @@ 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, kctrl);
+                                            term_type, rset_nmem, 
+                                            kctrl, scope,termid);
             else
                 rset[rscur] = rset_trunc_r (zi, term, length, flags,
                                             isam_p, i, to,
                                             merge_chunk, preserve_position,
-                                            term_type, rset_nmem, kctrl);
+                                            term_type, rset_nmem, 
+                                            kctrl, scope,termid);
             rscur++;
         }
         ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
         for (i = rscur; --i >= 0; )
         {
             rsfd[i] = rset_open (rset[i], RSETF_READ);
-            if (rset_read(rsfd[i], ti->tmpbuf))
+            if (rset_read(rsfd[i], ti->tmpbuf,0))
                 heap_insert (ti, ti->tmpbuf, i);
             else
             {
@@ -191,7 +194,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
 
             while (1)
             {
-                if (!rset_read (rsfd[n], ti->tmpbuf))
+                if (!rset_read (rsfd[n], ti->tmpbuf,0))
                 {
                     heap_delete (ti);
                     rset_close (rsfd[n]);
@@ -206,8 +209,8 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                 }
             }
         }
-        xfree (rset);
-        xfree (rsfd);
+        xfree(rset);
+        xfree(rsfd);
         heap_close (ti);
     }
     else if (zi->reg->isamc)
@@ -216,7 +219,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         int i;
         struct trunc_info *ti;
 
-        ispt = (ISAMC_PP *) xmalloc (sizeof(*ispt) * (to-from));
+        ispt = (ISAMC_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare_it);
@@ -262,7 +265,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             }
         }
         heap_close (ti);
-        xfree (ispt);
+        xfree(ispt);
     }
     else if (zi->reg->isams)
     {
@@ -271,7 +274,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         struct trunc_info *ti;
         int nn = 0;
 
-        ispt = (ISAMS_PP *) xmalloc (sizeof(*ispt) * (to-from));
+        ispt = (ISAMS_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare_it);
@@ -306,7 +309,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             }
         }
         heap_close (ti);
-        xfree (ispt);
+        xfree(ispt);
     }
     else if (zi->reg->isamb)
     {
@@ -314,14 +317,14 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         int i;
         struct trunc_info *ti;
 
-        ispt = (ISAMB_PP *) xmalloc (sizeof(*ispt) * (to-from));
+        ispt = (ISAMB_PP *) xmalloc(sizeof(*ispt) * (to-from));
 
         ti = heap_init (to-from, sizeof(struct it_key),
                         key_compare_it);
         for (i = to-from; --i >= 0; )
         {
 	    if (isam_p[from+i]) {
-                ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i]);
+                ispt[i] = isamb_pp_open (zi->reg->isamb, isam_p[from+i], scope);
                 if (isamb_pp_read (ispt[i], ti->tmpbuf))
                     heap_insert (ti, ti->tmpbuf, i);
                 else
@@ -363,10 +366,10 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             }
         }
         heap_close (ti);
-        xfree (ispt);
+        xfree(ispt);
     }
     else
-        logf (LOG_WARN, "Unknown isam set in rset_trunc_r");
+        yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc_r");
 
     rset_close (result_rsfd);
     return result;
@@ -403,64 +406,53 @@ static int isamc_trunc_cmp (const void *p1, const void *p2)
 RSET rset_trunc (ZebraHandle zi, ISAMS_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)
+                 const struct key_control *kctrl, int scope)
 {
-    logf (LOG_DEBUG, "rset_trunc no=%d", no);
+    TERMID termid;
+    yaz_log (YLOG_DEBUG, "rset_trunc no=%d", no);
     if (no < 1)
 	return rsnull_create (rset_nmem,kctrl);
+    termid = rset_term_create(term, length, flags, term_type,rset_nmem);
     if (zi->reg->isams)
     {
         if (no == 1)
-            return rsisams_create(rset_nmem, kctrl,
-                    zi->reg->isams, *isam_p);
+            return rsisams_create(rset_nmem, kctrl, scope,
+                    zi->reg->isams, *isam_p, termid);
         qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
     }
     else if (zi->reg->isamc)
     {
         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
+            return rsisamc_create(rset_nmem, kctrl, scope,
+                    zi->reg->isamc, *isam_p, termid);
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else if (zi->reg->isamb)
     {
         if (no == 1)
-            return rsisamb_create(rset_nmem,kctrl,
-                    zi->reg->isamb, *isam_p);
+            return rsisamb_create(rset_nmem,kctrl, scope,
+                    zi->reg->isamb, *isam_p, termid);
         else if (no <10000 ) /* FIXME - hardcoded number */
         {
             RSET r;
-            RSET *rsets=xmalloc(no*sizeof(RSET)); /* use nmem! */
+            RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */
             int i;
-            for (i=0;i<no;i++)
-                rsets[i]=rsisamb_create(rset_nmem, kctrl,
-                    zi->reg->isamb, isam_p[i] );
-            r=rsmultior_create( rset_nmem, kctrl, no, rsets);
+            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);
             xfree(rsets);
+            return r;
         } 
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else
     {
-        logf (LOG_WARN, "Unknown isam set in rset_trunc");
+        yaz_log (YLOG_WARN, "Unknown isam set in rset_trunc");
 	return rsnull_create (rset_nmem, kctrl);
     }
     return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100,
-                         preserve_position, term_type, rset_nmem,kctrl);
+                         preserve_position, term_type, rset_nmem,kctrl,scope,
+                         termid);
 }