X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=lib%2Findex.h;h=3aed7b97ee7c7b780182ed529c3bd23c58224bb3;hb=5815f75d01bb508be9e8a9aacf954e2db7c983bb;hp=7791c889e3289ac3bafc45ab058ce08715858c04;hpb=aef295bc85bf279262e3c586eb68ec79c99b0ba6;p=libucw.git

diff --git a/lib/index.h b/lib/index.h
index 7791c889..3aed7b97 100644
--- a/lib/index.h
+++ b/lib/index.h
@@ -1,15 +1,15 @@
 /*
  *	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
 #define _SHERLOCK_INDEX_H
 
-#include SHERLOCK_CUSTOM
+#include "custom/lib/custom.h"
 
-#define INDEX_VERSION (0x32250100+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
@@ -79,7 +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_GIANT_CLASS = 64,		/* Belongs to a very large class, subject to penalties [merger] */
+  CARD_FLAG_OVERRIDEN = 64,		/* Overriden by another index [sherlockd] */
 };
 
 #define CARD_POS_SHIFT 5		/* Card positions are shifted this # of bits to the right */
@@ -98,12 +98,29 @@ enum card_flag {
 #define CA_GET_FILE_TYPE(a) ((a)->type_flags >> 5)
 #define CA_GET_FILE_INFO(a) ((a)->type_flags & 0x1f)
 #define CA_GET_FILE_LANG(a) ((a)->type_flags & 0x80 ? 0 : CA_GET_FILE_INFO(a))
-#define FILETYPE_ATTRS SMALL_SET_ATTR(ftype, FILETYPE, CA_GET_FILE_TYPE, ext_ft_parse)
 #define MAX_FILE_TYPES 8
+#define FILETYPE_IS_TEXT(f) ((f) < 4)
 byte *ext_ft_parse(u32 *dest, byte *value, uns intval);
 extern byte *custom_file_type_names[MAX_FILE_TYPES];
+#define FILETYPE_STAT_VARS uns matching_per_type[MAX_FILE_TYPES];
+#define FILETYPE_SHOW_STATS(q,f) ext_ft_show(q,f)
+#define FILETYPE_INIT_STATS(q) bzero(q->matching_per_type, sizeof(q->matching_per_type))
+#ifdef CONFIG_COUNT_ALL_FILETYPES
+#define FILETYPE_ATTRS LATE_SMALL_SET_ATTR(ftype, FILETYPE, CA_GET_FILE_TYPE, ext_ft_parse)
+#define FILETYPE_EARLY_STATS(q,a) q->matching_per_type[CA_GET_FILE_TYPE(a)]++
+#define FILETYPE_LATE_STATS(q,a)
+#else
+#define FILETYPE_ATTRS SMALL_SET_ATTR(ftype, FILETYPE, CA_GET_FILE_TYPE, ext_ft_parse)
+#define FILETYPE_EARLY_STATS(q,a)
+#define FILETYPE_LATE_STATS(q,a) q->matching_per_type[CA_GET_FILE_TYPE(a)]++
+#endif
 #else
 #define FILETYPE_ATTRS
+#define FILETYPE_STAT_VARS
+#define FILETYPE_INIT_STATS(q)
+#define FILETYPE_EARLY_STATS(q,a)
+#define FILETYPE_LATE_STATS(q,a)
+#define FILETYPE_SHOW_STATS(q,f)
 #endif
 
 #ifdef CONFIG_LANG
@@ -114,7 +131,31 @@ byte *ext_lang_parse(u32 *dest, byte *value, uns intval);
 #define LANG_ATTRS
 #endif
 
-#define EXTENDED_ATTRS CUSTOM_ATTRS LANG_ATTRS		/* Beware, FILETYPE_ATTRS are handled separately */
+/*
+ * A list of all extended attributes: custom attributes and also some
+ * built-in attributes treated in the same way.
+ */
+
+#define EXTENDED_ATTRS CUSTOM_ATTRS FILETYPE_ATTRS LANG_ATTRS
+
+/*
+ * A list of all statistics collectors, also composed of custom parts
+ * and built-in parts.
+ */
+
+#ifndef CUSTOM_STAT_VARS
+#define CUSTOM_STAT_VARS
+#define CUSTOM_INIT_STATS(q)
+#define CUSTOM_EARLY_STATS(q,a)
+#define CUSTOM_LATE_STATS(q,a)
+#define CUSTOM_SHOW_STATS(q,f)
+#endif
+
+#define EXTENDED_STAT_VARS CUSTOM_STAT_VARS FILETYPE_STAT_VARS
+#define EXTENDED_INIT_STATS(q) CUSTOM_INIT_STATS(q) FILETYPE_INIT_STATS(q)
+#define EXTENDED_EARLY_STATS(q,a) CUSTOM_EARLY_STATS(q,a) FILETYPE_EARLY_STATS(q,a)
+#define EXTENDED_LATE_STATS(q,a) CUSTOM_LATE_STATS(q,a) FILETYPE_LATE_STATS(q,a)
+#define EXTENDED_SHOW_STATS(q,f) CUSTOM_SHOW_STATS(q,f) FILETYPE_SHOW_STATS(q,f)
 
 /* String fingerprints */
 
@@ -127,10 +168,16 @@ void fingerprint(byte *string, struct fingerprint *fp);
 static inline u32
 fp_hash(struct fingerprint *fp)
 {
-  /* This hash is expected to be monotonic wrt. fpsort's order by fprecog */
   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)