Omit CVS Id. Update copyright year.

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

diff --git a/index/trunc.c b/index/trunc.c
index fb9ae9c..3f05aa3 100644 (file)
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -1,8 +1,5 @@
-/* $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.
+/* This file is part of the Zebra server.
+   Copyright (C) 1995-2008 Index Data
 
 Zebra is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -400,65 +397,46 @@ static int isamc_trunc_cmp(const void *p1, const void *p2)
     return 0;
 }
 
-RSET rset_trunc(ZebraHandle zi, ISAM_P *isam_p, int no,
+RSET rset_trunc(ZebraHandle zh, 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, int reg_type,
+               struct ord_list *ol, const char *index_type,
                zint hits_limit, const char *term_ref_id)
 {
     TERMID termid;
     RSET result;
     int trunc_chunk;
-    
+    int trunc_limit = atoi(res_get_def(zh->res, "trunclimit", "10000"));
+
     termid = rset_term_create(term, length, flags, term_type, rset_nmem, ol,
-                             reg_type, hits_limit, term_ref_id);
+                             *index_type, hits_limit, term_ref_id);
+    
     if (no < 1)
        return rset_create_null(rset_nmem, kctrl, termid);
-    
-    if (zi->reg->isams)
-    {
-        if (no == 1)
-            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)
+    else if (no == 1)
+        return zebra_create_rset_isam(zh, rset_nmem, kctrl,
+                                      scope, *isam_p, termid);
+    else if (zh->reg->isamb && no > 1 && no < trunc_limit)
     {
-        if (no == 1)
-            return rsisamc_create(rset_nmem, kctrl, scope,
-                                 zi->reg->isamc, *isam_p, termid);
-        qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
+        RSET r;
+        RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */
+        int i;
+        for (i = 0; i<no; i++)
+            rsets[i] = rsisamb_create(rset_nmem, kctrl, scope,
+                                      zh->reg->isamb, isam_p[i],
+                                      0 /* termid */);
+        r = rset_create_or(rset_nmem, kctrl, scope,
+                           termid, no, rsets);
+        xfree(rsets);
+        return r;
     }
-    else if (zi->reg->isamb)
-    {
-       int trunc_limit = atoi(res_get_def(zi->res, "trunclimit", "10000"));
-        if (no == 1)
-            return rsisamb_create(rset_nmem, kctrl, scope,
-                                 zi->reg->isamb, *isam_p, termid);
-        else if (no < trunc_limit) 
-        {
-            RSET r;
-            RSET *rsets = xmalloc(no*sizeof(RSET)); /* use nmem! */
-            int i;
-            for (i = 0; i<no; i++)
-                rsets[i] = rsisamb_create(rset_nmem, kctrl, scope,
-                                         zi->reg->isamb, isam_p[i],
-                                         0 /* termid */);
-            r = rset_create_or(rset_nmem, kctrl, scope,
-                               termid, no, rsets);
-            xfree(rsets);
-            return r;
-        } 
+    if (zh->reg->isamc)
         qsort(isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
-    }
     else
-    {
-        yaz_log(YLOG_WARN, "Unknown isam set in rset_trunc");
-       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,
+        qsort(isam_p, no, sizeof(*isam_p), isams_trunc_cmp);
+    trunc_chunk = atoi(res_get_def(zh->res, "truncchunk", "20"));
+    result = rset_trunc_r(zh, term, length, flags, isam_p, 0, no, trunc_chunk,
                          preserve_position, term_type, rset_nmem, kctrl,
                          scope, termid);
     return result;