From 9a5888f7c81dece9a7f6ac1f7ab56172029044ac Mon Sep 17 00:00:00 2001
From: "Dirk-Jan C. Binnema" <djcb@djcbsoftware.nl>
Date: Sun, 19 Jun 2011 21:03:33 +0300
Subject: [PATCH] * enable the --threads/t argument for mu-find / queries

---
 src/mu-config.c | 2 ++
 src/mu-config.h | 3 ++-
 src/mu-query.cc | 4 ++--
 src/mu-query.h  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mu-config.c b/src/mu-config.c
index 578bfee8..b0fdaa86 100644
--- a/src/mu-config.c
+++ b/src/mu-config.c
@@ -162,6 +162,8 @@ config_options_group_find (MuConfig *opts)
 		 "fields to display in the output", NULL},
 		{"sortfield", 's', 0, G_OPTION_ARG_STRING, &opts->sortfield,
 		 "field to sort on", NULL},
+		{"threads", 't', 0, G_OPTION_ARG_NONE, &opts->threads,
+		 "show message threads", NULL},
 		{"bookmark", 'b', 0, G_OPTION_ARG_STRING, &opts->bookmark,
 		 "use a bookmarked query", NULL},
 		{"descending", 'z', 0, G_OPTION_ARG_NONE, &opts->descending,
diff --git a/src/mu-config.h b/src/mu-config.h
index a6ada7d5..e6617122 100644
--- a/src/mu-config.h
+++ b/src/mu-config.h
@@ -94,10 +94,11 @@ struct _MuConfig {
 					 * default */
 	int		max_msg_size;   /* maximum size for message files */
 	
-	/* options for querying  (and view-> 'summary') */
+	/* options for querying 'find' (and view-> 'summary') */
 	char		*fields;	/* fields to show in output */	
 	char	        *sortfield;	/* field to sort by (string) */
 	gboolean	 descending;	/* sort descending? */
+	gboolean	 threads;       /* show message threads */
 	gboolean	 summary;	/* include a summary? */
 	char            *bookmark;	/* use bookmark */
 	char		*formatstr;     /* output type
diff --git a/src/mu-query.cc b/src/mu-query.cc
index abb3d3fe..7a2b8096 100644
--- a/src/mu-query.cc
+++ b/src/mu-query.cc
@@ -333,7 +333,7 @@ mu_query_preprocess (const char *query)
 
 
 MuMsgIter*
-mu_query_run (MuQuery *self, const char* searchexpr,
+mu_query_run (MuQuery *self, const char* searchexpr, gboolean threads,
 	      MuMsgFieldId sortfieldid, gboolean ascending,
 	      GError **err)  
 {
@@ -363,7 +363,7 @@ mu_query_run (MuQuery *self, const char* searchexpr,
 		enq.set_cutoff(0,0);
 		
 		return mu_msg_iter_new ((XapianEnquire*)&enq,
-					self->_db.get_doccount());
+					self->_db.get_doccount(), threads);
 		
 	} MU_XAPIAN_CATCH_BLOCK_RETURN(NULL);
 }
diff --git a/src/mu-query.h b/src/mu-query.h
index 75ec1dd4..d91e94e4 100644
--- a/src/mu-query.h
+++ b/src/mu-query.h
@@ -69,6 +69,7 @@ char* mu_query_version (MuQuery *store)
  * 
  * @param self a valid MuQuery instance
  * @param expr the search expression
+ * @param threads calculate message-threads
  * @param sortfield the field id to sort by or MU_MSG_FIELD_ID_NONE if
  * sorting is not desired
  * @param ascending if TRUE sort in ascending (A-Z) order, otherwise,
@@ -80,7 +81,7 @@ char* mu_query_version (MuQuery *store)
  * @return a MuMsgIter instance you can iterate over, or NULL in
  * case of error
  */
-MuMsgIter* mu_query_run (MuQuery *self, const char* expr,
+MuMsgIter* mu_query_run (MuQuery *self, const char* expr, gboolean threads,
 			 MuMsgFieldId sortfieldid, gboolean ascending,
 			 GError **err)
     G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;