X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=5bb9c045b310d579ac5d2c492feea0f5881177ad;hb=75fe75c4ae6a1d4c0c6078e3cded9ad1a70d487e;hp=00f453c10fd68a2627a62263004cf022684dbf82;hpb=54196cf5a8914f1314a8fba42166dd809f9d2198;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index 00f453c..5bb9c04 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,4 +1,4 @@
-/* $Id: trunc.c,v 1.64 2005-10-22 17:32:09 adam Exp $
+/* $Id: trunc.c,v 1.66 2006-06-06 21:01:30 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -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)
@@ -414,7 +414,7 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int 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);
+	return rset_create_null(rset_nmem, kctrl, termid);
     
     if (zi->reg->isams)
     {
@@ -445,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;
         } 
@@ -456,7 +455,7 @@ 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", "20"));
     result = rset_trunc_r(zi, term, length, flags, isam_p, 0, no, trunc_chunk,
@@ -465,3 +464,11 @@ RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
     return result;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+