From 5ac96936811fb5f16e8522739ec4e3c9c49e8a92 Mon Sep 17 00:00:00 2001
From: djcb <djcb@djcbsoftware.nl>
Date: Thu, 24 Nov 2011 00:10:37 +0200
Subject: [PATCH] * mu-msg-fields.[ch]: add fields for searching text
 attachments (attach:), and   MIME content types (mime:); searching for
 attachment file names now goes   with file:.

---
 src/mu-msg-fields.c | 34 +++++++++++++++++++++++-----------
 src/mu-msg-fields.h |  6 +++---
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/mu-msg-fields.c b/src/mu-msg-fields.c
index 46e246e5..42e1da6d 100644
--- a/src/mu-msg-fields.c
+++ b/src/mu-msg-fields.c
@@ -84,19 +84,13 @@ typedef struct _MuMsgField MuMsgField;
  * misinterpreted by the query-preprocesser which turns queries into
  * lowercase */
 static const MuMsgField FIELD_DATA[] = {
-	{
-		MU_MSG_FIELD_ID_ATTACH,
-		MU_MSG_FIELD_TYPE_STRING,
-		"attach" , 'a', 'A',
-		FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_NORMALIZE |
-		FLAG_DONT_CACHE | FLAG_XAPIAN_PREFIX_ONLY
-	},
 
 	{
-		MU_MSG_FIELD_ID_ATTACH_MIME_TYPE,
+		MU_MSG_FIELD_ID_ATTACH_TEXT,
 		MU_MSG_FIELD_TYPE_STRING,
-		"attmime" , 'y', 'Y',
-		FLAG_XAPIAN_TERM | FLAG_XAPIAN_ESCAPE | FLAG_XAPIAN_PREFIX_ONLY
+		"attach", 'a', 'A',
+		FLAG_GMIME | FLAG_XAPIAN_INDEX | FLAG_NORMALIZE |
+		FLAG_DONT_CACHE
 	},
 
 	{
@@ -137,6 +131,15 @@ static const MuMsgField FIELD_DATA[] = {
 		FLAG_XAPIAN_BOOLEAN | FLAG_XAPIAN_PREFIX_ONLY
 	},
 
+	{
+		MU_MSG_FIELD_ID_FILE,
+		MU_MSG_FIELD_TYPE_STRING,
+		"file" , 'j', 'J',
+		FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_NORMALIZE |
+		FLAG_DONT_CACHE | FLAG_XAPIAN_PREFIX_ONLY
+	},
+
+
 	{
 		MU_MSG_FIELD_ID_FLAGS,
 		MU_MSG_FIELD_TYPE_INT,
@@ -165,7 +168,16 @@ static const MuMsgField FIELD_DATA[] = {
 		MU_MSG_FIELD_TYPE_STRING,
 		"maildir", 'm', 'M',
 		FLAG_GMIME | FLAG_XAPIAN_TERM | FLAG_XAPIAN_VALUE |
-		FLAG_NORMALIZE | FLAG_XAPIAN_ESCAPE | FLAG_XAPIAN_PREFIX_ONLY
+		FLAG_NORMALIZE | FLAG_XAPIAN_ESCAPE | FLAG_XAPIAN_PREFIX_ONLY |
+		FLAG_XAPIAN_BOOLEAN
+	},
+
+
+	{
+		MU_MSG_FIELD_ID_MIME,
+		MU_MSG_FIELD_TYPE_STRING,
+		"mime" , 'y', 'Y',
+		FLAG_XAPIAN_TERM | FLAG_XAPIAN_ESCAPE | FLAG_XAPIAN_PREFIX_ONLY
 	},
 
 	{
diff --git a/src/mu-msg-fields.h b/src/mu-msg-fields.h
index 25f0843b..6e5f875d 100644
--- a/src/mu-msg-fields.h
+++ b/src/mu-msg-fields.h
@@ -29,15 +29,15 @@ G_BEGIN_DECLS
 enum _MuMsgFieldId {
 
 	/* first all the string-based ones */
-	MU_MSG_FIELD_ID_ATTACH	            = 0,
-	MU_MSG_FIELD_ID_ATTACH_MIME_TYPE, /* mime-type */
-
+	MU_MSG_FIELD_ID_ATTACH_TEXT     = 0,
 	MU_MSG_FIELD_ID_BCC,
 	MU_MSG_FIELD_ID_BODY_HTML,
 	MU_MSG_FIELD_ID_BODY_TEXT,
 	MU_MSG_FIELD_ID_CC,
+	MU_MSG_FIELD_ID_FILE,
 	MU_MSG_FIELD_ID_FROM,
 	MU_MSG_FIELD_ID_MAILDIR,
+	MU_MSG_FIELD_ID_MIME, /* mime-type */
 	MU_MSG_FIELD_ID_MSGID,
 	MU_MSG_FIELD_ID_PATH,
 	MU_MSG_FIELD_ID_SUBJECT,