X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=d592e1dd5bfb4fbfe31cb70f972137868eb4e479;hb=ebb67760aea966de2e476018400f7449bc6f2ae8;hp=b5b3b631bc8fbd824b20e7a2a703cc2fbacb2217;hpb=774c155f12ee6473f38ece849a401dd8426178d3;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index b5b3b63..d592e1d 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994-1995, Index Data I/S 
+ * Copyright (C) 1994-1996, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.14  1995-10-30 15:08:08  adam
+ * 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
+ * Minor changes - removed include of ctype.h.
+ *
+ * Revision 1.16  1996/05/13  14:23:05  adam
+ * Work on compaction of set/use bytes in dictionary.
+ *
+ * Revision 1.15  1995/11/20  16:59:46  adam
+ * New update method: the 'old' keys are saved for each records.
+ *
+ * Revision 1.14  1995/10/30  15:08:08  adam
  * Bug fixes.
  *
  * Revision 1.13  1995/10/27  14:00:11  adam
@@ -58,7 +73,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <ctype.h>
 #include <assert.h>
 
 #include "index.h"
@@ -118,20 +132,163 @@ int key_qsort_compare (const void *p1, const void *p2)
     return cp1[l] - cp2[l];
 }
 
-int index_char_cvt (int c)
+struct iscz1_code_info {
+    struct it_key key;
+};
+
+static void *iscz1_code_start (int mode)
 {
-    return tolower (c);
+    struct iscz1_code_info *p = xmalloc (sizeof(*p));
+    p->key.sysno = 0;
+    p->key.seqno = 0;
+    return p;
 }
 
-int index_word_prefix (char *string, int attset_ordinal,
-                       int local_attribute,
-                       char *databaseName)
+static void iscz1_code_stop (int mode, void *p)
 {
-    int i;
-    sprintf (string, "%s@%c%04d", databaseName,
-             attset_ordinal + '0', local_attribute);
-    for (i = 0; string[i]; i++)
-        string[i] = index_char_cvt (string[i]);
-    return i;
+    xfree (p);
+}
+
+void iscz1_encode_int (unsigned d, char **dst)
+{
+    unsigned char *bp = (unsigned char*) *dst;
+
+    if (d <= 63)
+        *bp++ = d;
+    else if (d <= 16383)
+    {
+        *bp++ = 64 + (d>>8);
+       *bp++ = d & 255;
+    }
+    else if (d <= 4194303)
+    {
+        *bp++ = 128 + (d>>16);
+        *bp++ = (d>>8) & 255;
+        *bp++ = d & 255;
+    }
+    else
+    {
+        *bp++ = 192 + (d>>24);
+        *bp++ = (d>>16) & 255;
+        *bp++ = (d>>8) & 255;
+        *bp++ = d & 255;
+    }
+    *dst = (char *) bp;
+}
+
+int iscz1_decode_int (unsigned char **src)
+{
+    unsigned c = *(*src)++;
+    switch (c & 192)
+    {
+    case 0:
+        return c;
+    case 64:
+        return ((c & 63) << 8) + *(*src)++;
+    case 128:
+        c = ((c & 63) << 8) + *(*src)++;
+        c = (c << 8) + *(*src)++;
+        return c;
+    }
+    c = ((c & 63) << 8) + *(*src)++;
+    c = (c << 8) + *(*src)++;
+    c = (c << 8) + *(*src)++;
+    return c;
+}
+#if 1
+static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
+{
+    struct iscz1_code_info *p = vp;
+    struct it_key tkey;
+    int d;
+
+    if (mode == ISAMC_ENCODE)
+    {
+        memcpy (&tkey, *src, sizeof(struct it_key));
+        d = tkey.sysno - p->key.sysno;
+        if (d)
+        {
+            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;
+        }
+        (*src) += sizeof(struct it_key);
+    }
+    else
+    {
+        d = iscz1_decode_int ((unsigned char **) src);
+        if (d & 1)
+        {
+            p->key.seqno = d>>1;
+            p->key.sysno += iscz1_decode_int ((unsigned char **) src);
+        }
+        else
+            p->key.seqno += d>>1;
+        memcpy (*dst, &p->key, sizeof(struct it_key));
+        (*dst) += sizeof(struct it_key);
+    }
+}
+#else
+static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
+{
+    struct iscz1_code_info *p = vp;
+    struct it_key tkey;
+    int d;
+
+    if (mode == ISAMC_ENCODE)
+    {
+        memcpy (&tkey, *src, sizeof(struct it_key));
+        d = tkey.sysno - p->key.sysno;
+        iscz1_encode_int (d, dst);
+        if (d)
+        {
+            p->key.sysno = tkey.sysno;
+            p->key.seqno = 0;
+        }
+        iscz1_encode_int (tkey.seqno - p->key.seqno, dst);
+        p->key.seqno = tkey.seqno;
+        (*src) += sizeof(struct it_key);
+    }
+    else
+    {
+        d = iscz1_decode_int ((unsigned char **) src);
+        if (d)
+        {
+            p->key.sysno += d;
+            p->key.seqno = 0;
+        }
+        d = iscz1_decode_int ((unsigned char **) src);
+        p->key.seqno += d;
+        memcpy (*dst, &p->key, sizeof(struct it_key));
+        (*dst) += sizeof(struct it_key);
+    }
+}
+#endif
+
+ISAMC_M key_isamc_m (void)
+{
+    static ISAMC_M me = NULL;
+
+    if (me)
+        return me;
+
+    me = isc_getmethod ();
+
+    me->compare_item = key_compare;
+
+    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"));
+
+    logf (LOG_LOG, "ISAMC system active");
+    return me;
 }