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

diff --git a/index/kcompare.c b/index/kcompare.c
index d592e1d..e259f77 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,25 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1998, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.19  1996-12-11 12:08:00  adam
+ * 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.
+ *
+ * Revision 1.19  1996/12/11 12:08:00  adam
  * Added better compression.
  *
  * Revision 1.18  1996/10/29 14:09:44  adam
@@ -85,6 +100,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;
@@ -97,7 +131,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)
@@ -105,15 +138,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;
 }
 
@@ -132,6 +156,13 @@ 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;
 };
@@ -195,7 +226,7 @@ int iscz1_decode_int (unsigned char **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;
@@ -234,44 +265,8 @@ static void iscz1_code_item (int mode, void *vp, char **dst, char **src)
         (*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)
+ISAMC_M key_isamc_m (Res res)
 {
     static ISAMC_M me = NULL;
 
@@ -286,9 +281,8 @@ ISAMC_M key_isamc_m (void)
     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, "isamcDebug", "0"));
 
-    logf (LOG_LOG, "ISAMC system active");
     return me;
 }