X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=f9ecdc650dc2f984afc104f4c4943c43bdb8f2c5;hb=edff0b159ebbd0f26f58dda840f36ee400faab0c;hp=56ad3fbdfef949a74e74fd75a129d7665cbc4c5e;hpb=02e38d377742dae21e624d6fa1bf43c3940d9aac;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 56ad3fb..f9ecdc6 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,10 +1,23 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trunc.c,v $
- * Revision 1.8  1997-10-31 12:34:27  adam
+ * Revision 1.12  1999-02-02 14:51:10  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.11  1998/03/25 13:48:02  adam
+ * Fixed bug in rset_trunc_r.
+ *
+ * Revision 1.10  1998/03/05 08:45:13  adam
+ * New result set model and modular ranking system. Moved towards
+ * descent server API. System information stored as "SGML" records.
+ *
+ * Revision 1.9  1998/01/12 15:04:09  adam
+ * The test option (-s) only uses read-lock (and not write lock).
+ *
+ * Revision 1.8  1997/10/31 12:34:27  adam
  * Bug fix: memory leak.
  *
  * Revision 1.7  1997/09/29 09:07:29  adam
@@ -145,7 +158,8 @@ static void heap_close (struct trunc_info *ti)
     xfree (ti);
 }
 
-static RSET rset_trunc_r (ZServerInfo *zi, ISAM_P *isam_p, int from, int to,
+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)
 {
     RSET result; 
@@ -154,13 +168,15 @@ static RSET rset_trunc_r (ZServerInfo *zi, ISAM_P *isam_p, int from, int to,
 
     parms.key_size = sizeof(struct it_key);
     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|RSETF_SORT_SYSNO);
+    result_rsfd = rset_open (result, RSETF_WRITE);
 
     if (to - from > merge_chunk)
     {
         RSFD *rsfd;
         RSET *rset;
+	int term_index;
         int i, i_add = (to-from)/merge_chunk + 1;
         struct trunc_info *ti;
         int rscur = 0;
@@ -172,18 +188,18 @@ static RSET rset_trunc_r (ZServerInfo *zi, ISAM_P *isam_p, int from, int to,
         for (i = from; i < to; i += i_add)
         {
             if (i_add <= to - i)
-                rset[rscur] = rset_trunc_r (zi, isam_p, i, i+i_add,
-                                            merge_chunk);
+                rset[rscur] = rset_trunc_r (zi, term, length, flags,
+				            isam_p, i, i+i_add, merge_chunk);
             else
-                rset[rscur] = rset_trunc_r (zi, isam_p, i, to,
-                                            merge_chunk);
+                rset[rscur] = rset_trunc_r (zi, term, length, flags,
+                                            isam_p, i, to, merge_chunk);
             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|RSETF_SORT_SYSNO);
-            if (rset_read (rset[i], rsfd[i], ti->tmpbuf))
+            rsfd[i] = rset_open (rset[i], RSETF_READ);
+            if (rset_read (rset[i], rsfd[i], ti->tmpbuf, &term_index))
                 heap_insert (ti, ti->tmpbuf, i);
             else
             {
@@ -199,7 +215,7 @@ static RSET rset_trunc_r (ZServerInfo *zi, ISAM_P *isam_p, int from, int to,
 
             while (1)
             {
-                if (!rset_read (rset[n], rsfd[n], ti->tmpbuf))
+                if (!rset_read (rset[n], rsfd[n], ti->tmpbuf, &term_index))
                 {
                     heap_delete (ti);
                     rset_close (rset[n], rsfd[n]);
@@ -350,7 +366,8 @@ static int isamc_trunc_cmp (const void *p1, const void *p2)
     return isc_block (i1) - isc_block (i2);
 }
 
-RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no)
+RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no,
+		 const char *term, int length, const char *flags)
 {
     logf (LOG_DEBUG, "rset_trunc no=%d", no);
     if (zi->isam)
@@ -363,6 +380,7 @@ RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no)
 
             parms.pos = *isam_p;
             parms.is = zi->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);
@@ -377,6 +395,7 @@ RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no)
 
             parms.pos = *isam_p;
             parms.is = zi->isamc;
+	    parms.rset_term = rset_term_create (term, length, flags);
             return rset_create (rset_kind_isamc, &parms);
         }
 #if NEW_TRUNC
@@ -384,20 +403,23 @@ RSET rset_trunc (ZServerInfo *zi, ISAM_P *isam_p, int no)
         {
             rset_m_or_parms parms;
 
-            logf (LOG_LOG, "new_trunc");
             parms.key_size = sizeof(struct it_key);
             parms.cmp = key_compare_it;
             parms.isc = zi->isamc;
             parms.isam_positions = isam_p;
             parms.no_isam_positions = no;
-            parms.no_save_positions = 100;
+            parms.no_save_positions = 100000;
+	    parms.rset_term = rset_term_create (term, length, flags);
             return rset_create (rset_kind_m_or, &parms);
         }
 #endif
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
     else
-        logf (LOG_FATAL, "Neither isam nor isamc set in rset_trunc");
-    return rset_trunc_r (zi, isam_p, 0, no, 100);
+    {
+        logf (LOG_WARN, "Neither isam nor isamc set in rset_trunc");
+	return rset_create (rset_kind_null, NULL);
+    }
+    return rset_trunc_r (zi, term, length, flags, isam_p, 0, no, 100);
 }