X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Ftrunc.c;h=3063cd2f87c1683c8519ad80f6cc2189c698676b;hb=83533000f9456dcab2fc171abafd84d6104d4087;hp=c523bd396574b9c67f6195a62bfb7eac99ff6202;hpb=ef696645cc3b7e0f4027008d1dc589c0f0f90c1f;p=idzebra-moved-to-github.git

diff --git a/index/trunc.c b/index/trunc.c
index c523bd3..3063cd2 100644
--- a/index/trunc.c
+++ b/index/trunc.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: trunc.c,v $
- * Revision 1.14  1999-05-26 07:49:13  adam
+ * Revision 1.16  1999-11-30 13:48:03  adam
+ * Improved installation. Updated for inclusion of YAZ header files.
+ *
+ * Revision 1.15  1999/07/20 13:59:18  adam
+ * Fixed bug that occurred when phrases had 0 hits.
+ *
+ * Revision 1.14  1999/05/26 07:49:13  adam
  * C++ compilation.
  *
  * Revision 1.13  1999/05/12 13:08:06  adam
@@ -56,18 +62,19 @@
 #include <stdio.h>
 #include <assert.h>
 
+#define NEW_TRUNC 1
+
 #include "zserver.h"
 #include <rstemp.h>
+#include <rsnull.h>
+#include <rsisams.h>
+#if ZMBOL
 #include <rsisam.h>
 #include <rsisamc.h>
-#include <rsisams.h>
-#include <rsnull.h>
-
-#define NEW_TRUNC 1
-
 #if NEW_TRUNC
 #include <rsm_or.h>
 #endif
+#endif
 
 struct trunc_info {
     int  *ptr;
@@ -166,7 +173,7 @@ static void heap_close (struct trunc_info *ti)
 }
 
 static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
-			 const char *flags, ISAM_P *isam_p, int from, int to,
+			 const char *flags, ISAMS_P *isam_p, int from, int to,
                          int merge_chunk)
 {
     RSET result; 
@@ -241,6 +248,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         xfree (rsfd);
         heap_close (ti);
     }
+#if ZMBOL
     else if (zi->isam)
     {
         ISPT *ispt;
@@ -345,6 +353,7 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
         heap_close (ti);
         xfree (ispt);
     }
+#endif
     else if (zi->isams)
     {
         ISAMS_PP *ispt;
@@ -391,6 +400,15 @@ static RSET rset_trunc_r (ZebraHandle zi, const char *term, int length,
     return result;
 }
 
+static int isams_trunc_cmp (const void *p1, const void *p2)
+{
+    ISAMS_P i1 = *(ISAMS_P*) p1;
+    ISAMS_P i2 = *(ISAMS_P*) p2;
+
+    return i1 - i2;
+}
+
+#if ZMBOL
 static int isam_trunc_cmp (const void *p1, const void *p2)
 {
     ISAM_P i1 = *(ISAM_P*) p1;
@@ -414,24 +432,35 @@ static int isamc_trunc_cmp (const void *p1, const void *p2)
         return d;
     return isc_block (i1) - isc_block (i2);
 }
+#endif
 
-static int isams_trunc_cmp (const void *p1, const void *p2)
-{
-    ISAMS_P i1 = *(ISAMS_P*) p1;
-    ISAMS_P i2 = *(ISAMS_P*) p2;
-
-    return i1 - i2;
-}
-
-RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no,
+RSET rset_trunc (ZebraHandle zi, ISAMS_P *isam_p, int no,
 		 const char *term, int length, const char *flags)
 {
     logf (LOG_DEBUG, "rset_trunc no=%d", no);
-    if (zi->isam)
+    if (no < 1)
+    {
+	rset_null_parms parms;
+	parms.rset_term = rset_term_create (term, length, flags);
+	return rset_create (rset_kind_null, &parms);
+    }
+    if (zi->isams)
+    {
+        if (no == 1)
+        {
+            rset_isams_parms parms;
+
+            parms.pos = *isam_p;
+            parms.is = zi->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->isam)
     {
-        if (no < 1)
-            return rset_create (rset_kind_null, NULL);
-        else if (no == 1)
+        if (no == 1)
         {
             rset_isam_parms parms;
 
@@ -444,9 +473,7 @@ RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no,
     }
     else if (zi->isamc)
     {
-        if (no < 1)
-            return rset_create (rset_kind_null, NULL);
-        else if (no == 1)
+        if (no == 1)
         {
             rset_isamc_parms parms;
 
@@ -472,21 +499,7 @@ RSET rset_trunc (ZebraHandle zi, ISAM_P *isam_p, int no,
 #endif
         qsort (isam_p, no, sizeof(*isam_p), isamc_trunc_cmp);
     }
-    else if (zi->isams)
-    {
-        if (no < 1)
-            return rset_create (rset_kind_null, NULL);
-        else if (no == 1)
-        {
-            rset_isams_parms parms;
-
-            parms.pos = *isam_p;
-            parms.is = zi->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);
-    }
+#endif
     else
     {
         logf (LOG_WARN, "Neither isam / isamc / isams set in rset_trunc");