Minor changes - removed include of ctype.h.

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

diff --git a/index/kcompare.c b/index/kcompare.c
index fa407ec..f38f948 100644 (file)
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -1,10 +1,54 @@
 /*
- * 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.3  1995-09-07 13:58:36  adam
+ * 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
+ * Implemented detection of database availability.
+ *
+ * Revision 1.12  1995/10/17  18:02:08  adam
+ * New feature: databases. Implemented as prefix to words in dictionary.
+ *
+ * Revision 1.11  1995/10/06  16:33:37  adam
+ * Use attribute mappings.
+ *
+ * Revision 1.10  1995/09/29  14:01:41  adam
+ * Bug fixes.
+ *
+ * Revision 1.9  1995/09/28  12:10:32  adam
+ * Bug fixes. Field prefix used in queries.
+ *
+ * Revision 1.8  1995/09/28  09:19:42  adam
+ * xfree/xmalloc used everywhere.
+ * Extract/retrieve method seems to work for text records.
+ *
+ * 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.
@@ -27,6 +71,14 @@
 
 #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;
@@ -39,6 +91,7 @@ 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)
@@ -46,10 +99,10 @@ int key_compare (const void *p1, const void *p2)
         else
             return -1;
     }
-#if IT_KEY_HAVE_FIELD
-    if (i1.field != i2.field)
+#else
+    if (i1.freq != i2.freq)
     {
-        if (i1.field > i2.field)
+        if (i1.freq > i2.freq)
             return 1;
         else
             return -1;
@@ -58,16 +111,18 @@ int key_compare (const void *p1, const void *p2)
     return 0;
 }
 
-int key_compare_x (const struct it_key *i1, const struct it_key *i2)
+int key_qsort_compare (const void *p1, const void *p2)
 {
-    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
+    int r;
+    size_t l;
+    char *cp1 = *(char **) p1;
+    char *cp2 = *(char **) p2;
+ 
+    if ((r = strcmp (cp1, cp2)))
+        return r;
+    l = strlen(cp1)+1;
+    if ((r = key_compare (cp1+l+1, cp2+l+1)))
+        return r;
+    return cp1[l] - cp2[l];
 }