X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=76e93f4e052adc2ef563873cc48ed9e39768a008;hb=6b0310a64df542131c2f4abded39f35844235e4d;hp=388d473232e76c944f1783daa3c4eb5eb3e694a4;hpb=75a4bfb9aee40405a751320769d74fd890f2c0b4;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index 388d473..76e93f4 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,41 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.20  1996-12-23 15:30:44  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.
+ *
+ * Revision 1.23  1998/03/05 08:45:12  adam
+ * New result set model and modular ranking system. Moved towards
+ * descent server API. System information stored as "SGML" records.
+ *
+ * Revision 1.22  1997/09/22 12:39:06  adam
+ * Added get_pos method for the ranked result sets.
+ *
+ * Revision 1.21  1997/09/17 12:19:13  adam
+ * Zebra version corresponds to YAZ version 1.4.
+ * Changed Zebra server so that it doesn't depend on global common_resource.
+ *
+ * Revision 1.20  1996/12/23 15:30:44  adam
  * Work on truncation.
  * Bug fix: result sets weren't deleted after server shut down.
  *
@@ -145,18 +176,33 @@ int key_qsort_compare (const void *p1, const void *p2)
     return cp1[l] - cp2[l];
 }
 
+int key_get_pos (const void *p)
+{
+    struct it_key key;
+    memcpy (&key, p, sizeof(key));
+    return key.seqno;
+}
+
 struct iscz1_code_info {
     struct it_key key;
 };
 
 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);
@@ -211,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;
 
@@ -248,7 +294,7 @@ static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
     }
 }
 
-ISAMC_M key_isamc_m (void)
+ISAMC_M key_isamc_m (Res res)
 {
     static ISAMC_M me = NULL;
 
@@ -262,10 +308,44 @@ ISAMC_M key_isamc_m (void)
     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 (common_resource, "isamcDebug", "0"));
+    me->debug = atoi(res_get_def (res, "isamsDebug", "0"));
 
-    logf (LOG_LOG, "ISAMC system active");
     return me;
 }
 
+
+int key_SU_code (int ch, char *out)
+{
+    int i;
+    for (i = 0; ch; i++)
+    {
+	if (ch > 63)
+	    out[i] = 128 + (ch & 63);
+	else
+	    out[i] = 1 + ch;
+	ch = ch >> 6;
+    }
+    return i;
+}