When we add a new name, up all of the cache limits, because we're probably

2002-03-25  Not Zed  <NotZed@Ximian.com>

        * camel-text-index.c (text_index_add_name): When we add a new
        name, up all of the cache limits, because we're probably going to
        be adding more.
        (text_index_sync): Drop the cache limits back down again, we dont
        need them when looking words up.

        ** MERGE camel_index branch.

        * camel-text-index.[ch]: Added files i forgot to add (eep nearly
        lost all this work!)

        * camel-block-file.c (sync_nolock): Fix an infinite loop in syncing.

svn path=/trunk/; revision=16242

1 files changed, 4 insertions, 3 deletions

diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h
index 59f31d3628..3f29567aed 100644
--- a/camel/camel-folder-search.h
+++ b/camel/camel-folder-search.h
@@ -28,9 +28,9 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include <e-util/e-sexp.h>
-#include <libibex/ibex.h>
 #include <camel/camel-folder.h>
 #include <camel/camel-object.h>
+#include <camel/camel-index.h>
 
 #define CAMEL_FOLDER_SEARCH_TYPE         (camel_folder_search_get_type ())
 #define CAMEL_FOLDER_SEARCH(obj)         CAMEL_CHECK_CAST (obj, camel_folder_search_get_type (), CamelFolderSearch)
@@ -50,10 +50,11 @@ struct _CamelFolderSearch {
 	/* these are only valid during the search, and are reset afterwards */
 	CamelFolder *folder;	/* folder for current search */
 	GPtrArray *summary;	/* summary array for current search */
+	GHashTable *summary_hash; /* hashtable of summary items */
 	CamelMessageInfo *current; /* current message info, when searching one by one */
 	CamelMessageInfo *match1; /* message info, when searching a single message only */
 	CamelMimeMessage *current_message; /* cache of current message, if required */
-	ibex *body_index;
+	CamelIndex *body_index;
 };
 
 struct _CamelFolderSearchClass {
@@ -117,7 +118,7 @@ void camel_folder_search_construct (CamelFolderSearch *search);
 
 void camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder);
 void camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary);
-void camel_folder_search_set_body_index(CamelFolderSearch *search, ibex *index);
+void camel_folder_search_set_body_index(CamelFolderSearch *search, CamelIndex *index);
 GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);
 gboolean camel_folder_search_match_expression(CamelFolderSearch *search, const char *expr,
 					      const CamelMessageInfo *info, CamelException *ex);