X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Findex.h;h=d520f14c003afddde58a3e2a6130dc07a99ebf7b;hb=cab386086509de5dd4b87179d9e149c017fdc707;hp=18066ea884061187cf7e98c530abb9d9b2f8fbe2;hpb=bd0aafbce4e8f6658256e2f056f87890ae140fb4;p=libucw.git

diff --git a/lib/index.h b/lib/index.h
index 18066ea8..d520f14c 100644
--- a/lib/index.h
+++ b/lib/index.h
@@ -7,12 +7,12 @@
 #ifndef _SHERLOCK_INDEX_H
 #define _SHERLOCK_INDEX_H
 
-#include SHERLOCK_CUSTOM
+#include "custom/lib/custom.h"
 
-#define INDEX_VERSION (0x32240100+sizeof(struct card_attr))	/* Increase with each incompatible change in index format */
+#define INDEX_VERSION (0x32260200+sizeof(struct card_attr))	/* Increase with each incompatible change in index format */
 
 /*
- *  Words and word complexes
+ *  Words
  *
  *  MAX_WORD_LEN is the maximum length (measured in UTF-8 characters, excluding
  *  the terminating zero byte if there's any) of any word which may appear in the
@@ -21,15 +21,39 @@
  *
  *  Caveat: If you are upcasing/downcasing the word, the UTF-8 encoding can
  *  expand, although at most twice, so you need to reserve 2*MAX_WORD_LEN bytes.
- *
- *  MAX_COMPLEX_LEN is the upper bound on number of words in any word complex.
  */
 
 #define MAX_WORD_LEN		64	/* a multiple of 4 */
-#define MAX_COMPLEX_LEN		10
 
 /* Word and string types are defined in lib/custom.h */
 
+/* Types used for storing contexts */
+
+#ifdef CONFIG_CONTEXTS
+#if CONFIG_MAX_CONTEXTS == 32768
+typedef u16 context_t;
+#define bget_context bgetw
+#define bput_context bputw
+#define GET_CONTEXT GET_U16
+#define PUT_CONTEXT PUT_U16
+#elif CONFIG_MAX_CONTEXTS == 256
+typedef byte context_t;
+#define bget_context bgetc
+#define bput_context bputc
+#define GET_CONTEXT GET_U8
+#define PUT_CONTEXT PUT_U8
+#else
+#error CONFIG_MAX_CONTEXTS set to an invalid value.
+#endif
+#else
+struct fastbuf;
+typedef struct { } context_t;
+static inline uns bget_context(struct fastbuf *b UNUSED) { return 0; }
+static inline void bput_context(struct fastbuf *b UNUSED, uns context UNUSED) { }
+#define GET_CONTEXT(p) 0
+#define PUT_CONTEXT(p,x) do {} while(0)
+#endif
+
 /* Index card attributes */
 
 struct card_attr {
@@ -55,7 +79,6 @@ enum card_flag {
   CARD_FLAG_MERGED = 8,			/* Destination of a merge [merger] */
   CARD_FLAG_IMAGE = 16,			/* Is an image object [scanner] */
   CARD_FLAG_FRAMESET = 32,		/* Contains a frameset to be ignored [scanner] */
-  CARD_FLAG_GIANT_CLASS = 64,		/* Belongs to a very large class, subject to penalties [merger] */
 };
 
 #define CARD_POS_SHIFT 5		/* Card positions are shifted this # of bits to the right */
@@ -103,7 +126,7 @@ void fingerprint(byte *string, struct fingerprint *fp);
 static inline u32
 fp_hash(struct fingerprint *fp)
 {
-  return fp->hash[0] ^ fp->hash[1] ^ fp->hash[2] ^ fp->hash[3];
+  return (fp->hash[0] << 24) | (fp->hash[1] << 16) | (fp->hash[2] << 8) | fp->hash[3];
 }
 
 /* URL keys */