X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=index%2Fkcompare.c;h=b39535d0d2708ad34f43aadf1d0d8dac0ea415c9;hb=aebdede4bcc1dfe05728dac36b51a1cda85cc70e;hp=7ce3a24df3b77758c9151ab901773accef68d30d;hpb=caa7fe057dd8617129577a6725d2c4e3da066857;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index 7ce3a24..b39535d 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -4,7 +4,26 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.2  1995-09-06 16:11:17  adam
+ * Revision 1.7  1995-09-27 12:22:28  adam
+ * More work on extract in record control.
+ * Field name is not in isam keys but in prefix in dictionary words.
+ *
+ * Revision 1.6  1995/09/14  07:48:23  adam
+ * Record control management.
+ *
+ * Revision 1.5  1995/09/11  13:09:34  adam
+ * More work on relevance feedback.
+ *
+ * Revision 1.4  1995/09/08  14:52:27  adam
+ * Minor changes. Dictionary is lower case now.
+ *
+ * Revision 1.3  1995/09/07  13:58:36  adam
+ * New parameter: result-set file descriptor (RSFD) to support multiple
+ * positions within the same result-set.
+ * Boolean operators: and, or, not implemented.
+ * Result-set references.
+ *
+ * Revision 1.2  1995/09/06  16:11:17  adam
  * Option: only one word key per file.
  *
  * Revision 1.1  1995/09/04  09:10:36  adam
@@ -17,36 +36,52 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
+#include <ctype.h>
 #include <assert.h>
 
 #include "index.h"
 
+void key_logdump (int logmask, const void *p)
+{
+    struct it_key key;
+
+    memcpy (&key, p, sizeof(key));
+    logf (logmask, "%7d s=%-4d", key.sysno, key.seqno);
+}
+
 int key_compare (const void *p1, const void *p2)
 {
     struct it_key i1, i2;
     memcpy (&i1, p1, sizeof(i1));
     memcpy (&i2, p2, sizeof(i2));
-    if ( i1.sysno != i2.sysno)
-        return i1.sysno - i2.sysno;
-#if IT_KEY_HAVE_FIELD
-    if ( i1.seqno != i2.seqno)
-        return i1.seqno - i2.seqno;
-    return i1.field - i2.field;
+    if (i1.sysno != i2.sysno)
+    {
+        if (i1.sysno > i2.sysno)
+            return 2;
+        else
+            return -2;
+    }
+#if IT_KEY_HAVE_SEQNO
+    if (i1.seqno != i2.seqno)
+    {
+        if (i1.seqno > i2.seqno)
+            return 1;
+        else
+            return -1;
+    }
 #else
-    return i1.seqno - i2.seqno;
+    if (i1.freq != i2.freq)
+    {
+        if (i1.freq > i2.freq)
+            return 1;
+        else
+            return -1;
+    }
 #endif
+    return 0;
 }
 
-int key_compare_x (const struct it_key *i1, const struct it_key *i2)
+int index_char_cvt (int c)
 {
-    if ( i1->sysno != i2->sysno)
-        return i1->sysno - i2->sysno;
-#if IT_KEY_HAVE_FIELD
-    if ( i1->seqno != i2->seqno)
-        return i1->seqno - i2->seqno;
-    return i1->field - i2->field;
-#else
-    return i1->seqno - i2->seqno;
-#endif
+    return tolower (c);
 }
-