copied from isamc.h, simplifying

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

diff --git a/index/kcompare.c b/index/kcompare.c
index 64fcbfe..76e93f4 100644 (file)
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994-1998, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.24  1998-06-08 14:43:12  adam
+ * Revision 1.29  1999-06-30 09:08:23  adam
+ * Added coder to reset.
+ *
+ * Revision 1.28  1999/05/26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.27  1999/05/12 13:08:06  adam
+ * First version of ISAMS.
+ *
+ * Revision 1.26  1999/02/02 14:50:54  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.25  1998/06/08 15:26:06  adam
+ * Minor changes.
+ *
+ * Revision 1.24  1998/06/08 14:43:12  adam
  * Added suport for EXPLAIN Proxy servers - added settings databasePath
  * and explainDatabase to facilitate this. Increased maximum number
  * of databases and attributes in one register.
@@ -174,12 +189,20 @@ struct iscz1_code_info {
 
 static void *iscz1_code_start (int mode)
 {
-    struct iscz1_code_info *p = xmalloc (sizeof(*p));
+    struct iscz1_code_info *p = (struct iscz1_code_info *)
+       xmalloc (sizeof(*p));
     p->key.sysno = 0;
     p->key.seqno = 0;
     return p;
 }
 
+static void iscz1_code_reset (void *vp)
+{
+    struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
+    p->key.sysno = 0;
+    p->key.seqno = 0;
+}
+
 static void iscz1_code_stop (int mode, void *p)
 {
     xfree (p);
@@ -234,7 +257,7 @@ int iscz1_decode_int (unsigned char **src)
 
 static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
 {
-    struct iscz1_code_info *p = vp;
+    struct iscz1_code_info *p = (struct iscz1_code_info *) vp;
     struct it_key tkey;
     int d;
 
@@ -285,23 +308,43 @@ ISAMC_M key_isamc_m (Res res)
     me->code_start = iscz1_code_start;
     me->code_item = iscz1_code_item;
     me->code_stop = iscz1_code_stop;
+    me->code_reset = iscz1_code_reset;
 
     me->debug = atoi(res_get_def (res, "isamcDebug", "0"));
 
     return me;
 }
 
+ISAMS_M key_isams_m (Res res)
+{
+    static ISAMS_M me = NULL;
+
+    if (me)
+        return me;
+
+    me = isams_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 (res, "isamsDebug", "0"));
+
+    return me;
+}
+
+
 int key_SU_code (int ch, char *out)
 {
     int i;
-    logf (LOG_LOG, "key_SU_code: %d", ch);
     for (i = 0; ch; i++)
     {
        if (ch > 63)
            out[i] = 128 + (ch & 63);
        else
            out[i] = 1 + ch;
-       logf (LOG_LOG, " %d", out[i]);
        ch = ch >> 6;
     }
     return i;