X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=388d473232e76c944f1783daa3c4eb5eb3e694a4;hb=af7bc27d33843a8e667022f24589450c39f907f2;hp=2d7e72095899268838dca6b0b5e32c6558f82f64;hpb=45554249f7785e31125a062dc410a93ef693f574;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index 2d7e720..388d473 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.18  1996-10-29 14:09:44  adam
+ * Revision 1.20  1996-12-23 15:30:44  adam
+ * Work on truncation.
+ * Bug fix: result sets weren't deleted after server shut down.
+ *
+ * Revision 1.19  1996/12/11 12:08:00  adam
+ * Added better compression.
+ *
+ * Revision 1.18  1996/10/29 14:09:44  adam
  * Use of cisam system - enabled if setting isamc is 1.
  *
  * Revision 1.17  1996/06/04 10:18:58  adam
@@ -82,6 +89,25 @@ void key_logdump (int logmask, const void *p)
     logf (logmask, "%7d s=%-4d", key.sysno, key.seqno);
 }
 
+int key_compare_it (const void *p1, const void *p2)
+{
+    if (((struct it_key *) p1)->sysno != ((struct it_key *) p2)->sysno)
+    {
+        if (((struct it_key *) p1)->sysno > ((struct it_key *) p2)->sysno)
+            return 2;
+        else
+            return -2;
+    }
+    if (((struct it_key *) p1)->seqno != ((struct it_key *) p2)->seqno)
+    {
+        if (((struct it_key *) p1)->seqno > ((struct it_key *) p2)->seqno)
+            return 1;
+        else
+            return -1;
+    }
+    return 0;
+}
+
 int key_compare (const void *p1, const void *p2)
 {
     struct it_key i1, i2;
@@ -94,7 +120,6 @@ int key_compare (const void *p1, const void *p2)
         else
             return -2;
     }
-#if IT_KEY_HAVE_SEQNO
     if (i1.seqno != i2.seqno)
     {
         if (i1.seqno > i2.seqno)
@@ -102,15 +127,6 @@ int key_compare (const void *p1, const void *p2)
         else
             return -1;
     }
-#else
-    if (i1.freq != i2.freq)
-    {
-        if (i1.freq > i2.freq)
-            return 1;
-        else
-            return -1;
-    }
-#endif
     return 0;
 }
 
@@ -129,24 +145,24 @@ int key_qsort_compare (const void *p1, const void *p2)
     return cp1[l] - cp2[l];
 }
 
-struct iscz_code_info {
+struct iscz1_code_info {
     struct it_key key;
 };
 
-static void *iscz_code_start (int mode)
+static void *iscz1_code_start (int mode)
 {
-    struct iscz_code_info *p = xmalloc (sizeof(*p));
+    struct iscz1_code_info *p = xmalloc (sizeof(*p));
     p->key.sysno = 0;
     p->key.seqno = 0;
     return p;
 }
 
-static void iscz_code_stop (int mode, void *p)
+static void iscz1_code_stop (int mode, void *p)
 {
     xfree (p);
 }
 
-void iscz_encode_int (unsigned d, char **dst)
+void iscz1_encode_int (unsigned d, char **dst)
 {
     unsigned char *bp = (unsigned char*) *dst;
 
@@ -173,7 +189,7 @@ void iscz_encode_int (unsigned d, char **dst)
     *dst = (char *) bp;
 }
 
-int isxz_decode_int (unsigned char **src)
+int iscz1_decode_int (unsigned char **src)
 {
     unsigned c = *(*src)++;
     switch (c & 192)
@@ -193,9 +209,9 @@ int isxz_decode_int (unsigned char **src)
     return c;
 }
 
-static void iscz_code_item (int mode, void *vp, char **dst, char **src)
+static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
 {
-    struct iscz_code_info *p = vp;
+    struct iscz1_code_info *p = vp;
     struct it_key tkey;
     int d;
 
@@ -203,26 +219,30 @@ static void iscz_code_item (int mode, void *vp, char **dst, char **src)
     {
         memcpy (&tkey, *src, sizeof(struct it_key));
         d = tkey.sysno - p->key.sysno;
-        iscz_encode_int (d, dst);
         if (d)
         {
-            p->key.sysno = tkey.sysno;
-            p->key.seqno = 0;
+            iscz1_encode_int (2*tkey.seqno + 1, dst);
+            iscz1_encode_int (d, dst);
+            p->key.sysno += d;
+            p->key.seqno = tkey.seqno;
+        }
+        else
+        {
+            iscz1_encode_int (2*(tkey.seqno - p->key.seqno), dst);
+            p->key.seqno = tkey.seqno;
         }
-        iscz_encode_int (tkey.seqno - p->key.seqno, dst);
-        p->key.seqno = tkey.seqno;
         (*src) += sizeof(struct it_key);
     }
     else
     {
-        d = isxz_decode_int ((unsigned char **) src);
-        if (d)
+        d = iscz1_decode_int ((unsigned char **) src);
+        if (d & 1)
         {
-            p->key.sysno += d;
-            p->key.seqno = 0;
+            p->key.seqno = d>>1;
+            p->key.sysno += iscz1_decode_int ((unsigned char **) src);
         }
-        d = isxz_decode_int ((unsigned char **) src);
-        p->key.seqno += d;
+        else
+            p->key.seqno += d>>1;
         memcpy (*dst, &p->key, sizeof(struct it_key));
         (*dst) += sizeof(struct it_key);
     }
@@ -239,9 +259,9 @@ ISAMC_M key_isamc_m (void)
 
     me->compare_item = key_compare;
 
-    me->code_start = iscz_code_start;
-    me->code_item = iscz_code_item;
-    me->code_stop = iscz_code_stop;
+    me->code_start = iscz1_code_start;
+    me->code_item = iscz1_code_item;
+    me->code_stop = iscz1_code_stop;
 
     me->debug = atoi(res_get_def (common_resource, "isamcDebug", "0"));