X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkcompare.c;h=981a485d9731acf13d64dcb09c95422382e7c4a1;hb=eb4e33573a00795f2b1c0dfebb51ab59ffd5a0d9;hp=fc633e156ec80c68431aa5be22e73dbd642473f6;hpb=ce20a8a823a2df86ace4862008684c71a4f06cd2;p=idzebra-moved-to-github.git

diff --git a/index/kcompare.c b/index/kcompare.c
index fc633e1..981a485 100644
--- a/index/kcompare.c
+++ b/index/kcompare.c
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: kcompare.c,v $
- * Revision 1.6  1995-09-14 07:48:23  adam
+ * 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
@@ -42,57 +56,61 @@ void key_logdump (int logmask, const void *p)
     struct it_key key;
 
     memcpy (&key, p, sizeof(key));
-    logf (logmask, "%7d s=%-4d f=%d,%d", key.sysno, key.seqno,
-             key.attrSet, key.attrUse);
+    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)
+    const struct it_key *i1 = p1, *i2 = p2;
+    if (i1->sysno != i2->sysno)
     {
-        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)
     {
-        if (i1.seqno > i2.seqno)
+        if (i1->seqno > i2->seqno)
             return 1;
         else
             return -1;
     }
 #else
-    if (i1.freq != i2.freq)
+    if (i1->freq != i2->freq)
     {
-        if (i1.freq > i2.freq)
+        if (i1->freq > i2->freq)
             return 1;
         else
             return -1;
     }
 #endif
-    if (i1.attrSet != i2.attrSet)
-    {
-        if (i1.attrSet > i2.attrSet)
-            return 1;
-        else
-            return -1;
-    }
-    if (i1.attrUse != i2.attrUse)
-    {
-        if (i1.attrUse > i2.attrUse)
-            return 1;
-        else
-            return -1;
-    }
     return 0;
 }
 
+int key_qsort_compare (const void *p1, const void *p2)
+{
+    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];
+}
+
 int index_char_cvt (int c)
 {
     return tolower (c);
 }
+
+int index_word_prefix (char *string, int attrSet, int attrUse)
+{
+    sprintf (string, "%c%04d", attrSet + '0', attrUse);
+    return 5;
+}