Update copyright year + FSF address

[idzebra-moved-to-github.git] / index / trunc.c

diff --git a/index/trunc.c b/index/trunc.c
index 63b27e8..fb9ae9c 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,5 +1,5 @@
-/* $Id: trunc.c,v 1.59 2005-06-06 21:31:08 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: trunc.c,v 1.67 2006-08-14 10:40:15 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -134,8 +134,8 @@ static RSET rset_trunc_r(ZebraHandle zi, const char *term, int length,
     RSFD result_rsfd;
     int nn = 0;
 
-    result = rstemp_create(rset_nmem, kctrl, scope,
-                          res_get(zi->res, "setTmpDir"), termid);
+    result = rset_create_temp(rset_nmem, kctrl, scope,
+                              res_get(zi->res, "setTmpDir"), termid);
     result_rsfd = rset_open(result, RSETF_WRITE);
 
     if (to - from > merge_chunk)
@@ -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,15 +404,17 @@ 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);
+       return rset_create_null(rset_nmem, kctrl, termid);
     
     if (zi->reg->isams)
     {
@@ -439,9 +445,8 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
                 rsets[i] = rsisamb_create(rset_nmem, kctrl, scope,
                                          zi->reg->isamb, isam_p[i],
                                          0 /* termid */);
-            r = rsmulti_or_create(rset_nmem, kctrl, scope,
-                                 termid /* termid */,
-                                 no, rsets);
+            r = rset_create_or(rset_nmem, kctrl, scope,
+                               termid, no, rsets);
             xfree(rsets);
             return r;
         } 
@@ -450,12 +455,20 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
     else
     {
         yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
-       return rsnull_create(rset_nmem, kctrl, 0);
+       return rset_create_null(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
+ */
+