[gnus git] branch master updated: n0-13-17-gfb9385f

       via  fb9385fba737a55bb38168d5eb0f431b38e3dad6 (commit)
      from  3787aa19f4e056adca97b8d2bfbdf69ad17e0197 (commit)


- Log -----------------------------------------------------------------
commit fb9385fba737a55bb38168d5eb0f431b38e3dad6
Author: Andrew Cohen <[email protected]>
Date:   Tue Feb 22 12:34:22 2011 -0500

    * nnir.el: Lower case imap search terms. Cache and reuse imap search terms.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2fb29bc..3a7359b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-22  Andrew Cohen  <[email protected]>
+
+	* nnir.el (nnir-imap-search-arguments,nnir-imap-default-search-key):
+	Lower case names of search constraints.
+	(nnir-run-query): Cache and reuse search constraints for all imap
+	servers.
+
 2011-02-22  Lars Ingebrigtsen  <[email protected]>
 
 	* gnus-msg.el (gnus-inews-add-send-actions): Restore the winconf name
diff --git a/lisp/nnir.el b/lisp/nnir.el
index 8e91c68..eaaac3f 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -203,11 +203,12 @@
 ;; Imap variables
 
 (defvar nnir-imap-search-arguments
-  '(("Whole message" . "TEXT")
-    ("Subject" . "SUBJECT")
-    ("To" . "TO")
-    ("From" . "FROM")
-    ("Imap" . ""))
+  '(("whole message" . "TEXT")
+    ("subject" . "SUBJECT")
+    ("to" . "TO")
+    ("from" . "FROM")
+    ("body" . "BODY")
+    ("imap" . ""))
   "Mapping from user readable keys to IMAP search items for use in nnir")
 
 (defvar nnir-imap-search-other "HEADER %S"
@@ -335,7 +336,7 @@ result, `gnus-retrieve-headers' will be called instead."
   :type '(function)
   :group 'nnir)
 
-(defcustom nnir-imap-default-search-key "Whole message"
+(defcustom nnir-imap-default-search-key "whole message"
   "*The default IMAP search key for an nnir search. Must be one of
   the keys in `nnir-imap-search-arguments'. To use raw imap queries
   by default set this to \"Imap\"."
@@ -1500,9 +1501,12 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 		(setq search-func (cadr (assoc nnir-search-engine
 					       nnir-engines)))
 		(if search-func
-		    (funcall search-func
+		    (funcall
+		     search-func
 			     (if nnir-extra-parms
-				 (nnir-read-parms q nnir-search-engine)
+			 (or (and (eq nnir-search-engine 'imap)
+				  (assq 'criteria q) q)
+			     (setq q (nnir-read-parms q nnir-search-engine)))
 			       q)
 			     server (cadr x))
 		  nil)))

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 lisp/ChangeLog |    7 +++++++
 lisp/nnir.el   |   26 +++++++++++++++-----------
 2 files changed, 22 insertions(+), 11 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project