X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Ftrunc.c;h=40c0e501bbd47ea97a105de0f058bcd1dc162adb;hb=85728191a4dc93d31e3d1bd0ddc2ae60381ae6ba;hp=954302cc44f7f6b864e1f1389da0e5a303f1ff68;hpb=f1a944fbdac20e88bf55918f2a4f66c301d684e2;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 954302c..40c0e50 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trunc.c,v $
- * Revision 1.20  2002-03-20 20:24:29  adam
+ * Revision 1.23  2002-04-12 14:40:42  adam
+ * Work on XPATH
+ *
+ * Revision 1.22  2002/04/05 08:46:26  adam
+ * Zebra with full functionality
+ *
+ * Revision 1.21  2002/04/04 14:14:13  adam
+ * Multiple registers (alpha early)
+ *
+ * Revision 1.20  2002/03/20 20:24:29  adam
  * Hits per term. Returned in SearchResult-1
  *
  * Revision 1.19  2001/01/16 16:56:15  heikki
@@ -76,18 +85,16 @@
 
 #define NEW_TRUNC 1
 
-#include "zserver.h"
+#include "index.h"
 #include <rstemp.h>
 #include <rsnull.h>
 #include <rsisams.h>
-#if ZMBOL
 #include <rsisam.h>
 #include <rsisamc.h>
 #include <rsisamd.h>
 #if NEW_TRUNC
 #include <rsm_or.h>
 #endif
-#endif
 
 struct trunc_info {
     int  *ptr;
@@ -186,8 +193,8 @@ static void heap_close (struct trunc_info *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)
+                          const char *flags, ISAMS_P *isam_p, int from, int to,
+                          int merge_chunk, int preserve_position)
 {
     RSET result; 
     RSFD result_rsfd;
@@ -195,7 +202,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
 
     parms.cmp = key_compare_it;
     parms.key_size = sizeof(struct it_key);
-    parms.temp_path = res_get (zi->service->res, "setTmpDir");
+    parms.temp_path = res_get (zi->res, "setTmpDir");
     parms.rset_term = rset_term_create (term, length, flags);
     result = rset_create (rset_kind_temp, &parms);
     result_rsfd = rset_open (result, RSETF_WRITE);
@@ -217,10 +224,12 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         {
             if (i_add <= to - i)
                 rset[rscur] = rset_trunc_r (zi, term, length, flags,
-				            isam_p, i, i+i_add, merge_chunk);
+				            isam_p, i, i+i_add,
+                                            merge_chunk, preserve_position);
             else
                 rset[rscur] = rset_trunc_r (zi, term, length, flags,
-                                            isam_p, i, to, merge_chunk);
+                                            isam_p, i, to,
+                                            merge_chunk, preserve_position);
             rscur++;
         }
         ti = heap_init (rscur, sizeof(struct it_key), key_compare_it);
@@ -262,8 +271,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         xfree (rsfd);
         heap_close (ti);
     }
-#if ZMBOL
-    else if (zi->service->isam)
+    else if (zi->reg->isam)
     {
         ISPT *ispt;
         int i;
@@ -275,7 +283,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                         key_compare_it);
         for (i = to-from; --i >= 0; )
         {
-            ispt[i] = is_position (zi->service->isam, isam_p[from+i]);
+            ispt[i] = is_position (zi->reg->isam, isam_p[from+i]);
             if (is_readkey (ispt[i], ti->tmpbuf))
                 heap_insert (ti, ti->tmpbuf, i);
             else
@@ -315,7 +323,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         heap_close (ti);
         xfree (ispt);
     }
-    else if (zi->service->isamc)
+    else if (zi->reg->isamc)
     {
         ISAMC_PP *ispt;
         int i;
@@ -327,7 +335,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                         key_compare_it);
         for (i = to-from; --i >= 0; )
         {
-            ispt[i] = isc_pp_open (zi->service->isamc, isam_p[from+i]);
+            ispt[i] = isc_pp_open (zi->reg->isamc, isam_p[from+i]);
             if (isc_pp_read (ispt[i], ti->tmpbuf))
                 heap_insert (ti, ti->tmpbuf, i);
             else
@@ -338,37 +346,38 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
             int n = ti->indx[ti->ptr[1]];
 
             rset_write (result, result_rsfd, ti->heap[ti->ptr[1]]);
-#if 0
-/* section that preserve all keys */
-            heap_delete (ti);
-            if (isc_pp_read (ispt[n], ti->tmpbuf))
-                heap_insert (ti, ti->tmpbuf, n);
-            else
-                isc_pp_close (ispt[n]);
-#else
-/* section that preserve all keys with unique sysnos */
-            while (1)
+            if (preserve_position)
             {
-                if (!isc_pp_read (ispt[n], ti->tmpbuf))
-                {
-                    heap_delete (ti);
+                heap_delete (ti);
+                if (isc_pp_read (ispt[n], ti->tmpbuf))
+                    heap_insert (ti, ti->tmpbuf, n);
+                else
                     isc_pp_close (ispt[n]);
-                    break;
-                }
-                if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+            }
+            else
+            {
+                while (1)
                 {
-                    heap_delete (ti);
-                    heap_insert (ti, ti->tmpbuf, n);
-                    break;
+                    if (!isc_pp_read (ispt[n], ti->tmpbuf))
+                    {
+                        heap_delete (ti);
+                        isc_pp_close (ispt[n]);
+                        break;
+                    }
+                    if ((*ti->cmp)(ti->tmpbuf, ti->heap[ti->ptr[1]]) > 1)
+                    {
+                        heap_delete (ti);
+                        heap_insert (ti, ti->tmpbuf, n);
+                        break;
+                    }
                 }
             }
-#endif
         }
         heap_close (ti);
         xfree (ispt);
     }
 
-    else if (zi->service->isamd)
+    else if (zi->reg->isamd)
     {
         ISAMD_PP *ispt;
         int i;
@@ -380,7 +389,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                         key_compare_it);
         for (i = to-from; --i >= 0; )
         {
-            ispt[i] = isamd_pp_open (zi->service->isamd, isam_p[from+i]);
+            ispt[i] = isamd_pp_open (zi->reg->isamd, isam_p[from+i]);
             if (isamd_pp_read (ispt[i], ti->tmpbuf))
                 heap_insert (ti, ti->tmpbuf, i);
             else
@@ -421,8 +430,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         xfree (ispt);
     }
 
-#endif
-    else if (zi->service->isams)
+    else if (zi->reg->isams)
     {
         ISAMS_PP *ispt;
         int i;
@@ -434,7 +442,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
                         key_compare_it);
         for (i = to-from; --i >= 0; )
         {
-            ispt[i] = isams_pp_open (zi->service->isams, isam_p[from+i]);
+            ispt[i] = isams_pp_open (zi->reg->isams, isam_p[from+i]);
             if (isams_pp_read (ispt[i], ti->tmpbuf))
                 heap_insert (ti, ti->tmpbuf, i);
             else
@@ -479,7 +487,6 @@ static int isams_trunc_cmp (const void *p1, const void *p2)
     return i1 - i2;
 }
 
-#if ZMBOL
 static int isam_trunc_cmp (const void *p1, const void *p2)
 {
     ISAM_P i1 = *(ISAM_P*) p1;
@@ -514,10 +521,10 @@ static int isamd_trunc_cmp (const void *p1, const void *p2)
         return d;
     return isamd_block (i1) - isamd_block (i2);
 }
-#endif
 
 RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
-		 const char *term, int length, const char *flags)
+		 const char *term, int length, const char *flags,
+                 int preserve_position)
 {
     logf (LOG_DEBUG, "rset_trunc no=%d", no);
     if (no < 1)
@@ -526,34 +533,33 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 	parms.rset_term = rset_term_create (term, length, flags);
 	return rset_create (rset_kind_null, &parms);
     }
-    if (zi->service->isams)
+    if (zi->reg->isams)
     {
         if (no == 1)
         {
             rset_isams_parms parms;
 
             parms.pos = *isam_p;
-            parms.is = zi->service->isams;
+            parms.is = zi->reg->isams;
 	    parms.rset_term = rset_term_create (term, length, flags);
             return rset_create (rset_kind_isams, &parms);
         }
         qsort (isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
     }
-#if ZMBOL
-    else if (zi->service->isam)
+    else if (zi->reg->isam)
     {
         if (no == 1)
         {
             rset_isam_parms parms;
 
             parms.pos = *isam_p;
-            parms.is = zi->service->isam;
+            parms.is = zi->reg->isam;
 	    parms.rset_term = rset_term_create (term, length, flags);
             return rset_create (rset_kind_isam, &parms);
         }
         qsort (isam_p, no, sizeof(*isam_p), isam_trunc_cmp);
     }
-    else if (zi->service->isamc)
+    else if (zi->reg->isamc)
     {
         if (no == 1)
         {
@@ -562,7 +568,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
             parms.key_size = sizeof(struct it_key);
             parms.cmp = key_compare_it;
             parms.pos = *isam_p;
-            parms.is = zi->service->isamc;
+            parms.is = zi->reg->isamc;
 	    parms.rset_term = rset_term_create (term, length, flags);
             return rset_create (rset_kind_isamc, &parms);
         }
@@ -573,7 +579,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 
             parms.key_size = sizeof(struct it_key);
             parms.cmp = key_compare_it;
-            parms.isc = zi->service->isamc;
+            parms.isc = zi->reg->isamc;
             parms.isam_positions = isam_p;
             parms.no_isam_positions = no;
             parms.no_save_positions = 100000;
@@ -583,14 +589,14 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 #endif
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
-    else if (zi->service->isamd)
+    else if (zi->reg->isamd)
     {
         if (no == 1)
         {
             rset_isamd_parms parms;
 
             parms.pos = *isam_p;
-            parms.is = zi->service->isamd;
+            parms.is = zi->reg->isamd;
 	    parms.rset_term = rset_term_create (term, length, flags);
             return rset_create (rset_kind_isamd, &parms);
         }
@@ -602,7 +608,7 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
             parms.key_size = sizeof(struct it_key);
             parms.cmp = key_compare_it;
             parms.isc = 0;
-            parms.isamd=zi->service->isamd;
+            parms.isamd=zi->reg->isamd;
             parms.isam_positions = isam_p;
             parms.no_isam_positions = no;
             parms.no_save_positions = 100000;
@@ -612,12 +618,12 @@ RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 #endif
         qsort (isam_p, no, sizeof(*isam_p), isamd_trunc_cmp);
     }
-#endif
     else
     {
         logf (LOG_WARN, "Unknown isam set in rset_trunc");
 	return rset_create (rset_kind_null, NULL);
     }
-    return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100);
+    return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100,
+                         preserve_position);
 }