Moved struct card_prints to index.h, because it's used outside the indexer.

Added CARD_FLAG_OVERRIDEN.

diff --git a/lib/index.h b/lib/index.h
index d520f14c003afddde58a3e2a6130dc07a99ebf7b..eb5fcdb7411c32ff7f869a37a70413aafdd62549 100644 (file)
--- a/lib/index.h
+++ b/lib/index.h
@@ -1,7 +1,7 @@
 /*
  *     Sherlock: Data structures used in indices
  *
- *     (c) 2001--2003 Martin Mares <mj@ucw.cz>
+ *     (c) 2001--2004 Martin Mares <mj@ucw.cz>
  */
 
 #ifndef _SHERLOCK_INDEX_H
@@ -79,6 +79,7 @@ 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_OVERRIDEN = 64,            /* Overriden by another index [sherlockd] */
 };
 
 #define CARD_POS_SHIFT 5               /* Card positions are shifted this # of bits to the right */
@@ -129,6 +130,13 @@ fp_hash(struct fingerprint *fp)
   return (fp->hash[0] << 24) | (fp->hash[1] << 16) | (fp->hash[2] << 8) | fp->hash[3];
 }
 
+/* The card fingerprints */
+
+struct card_print {
+  struct fingerprint fp;
+  u32 cardid;
+};
+
 /* URL keys */
 
 #define URL_KEY_BUF_SIZE (3*MAX_URL_SIZE)