Re: nnir and the new nnimap

[Andrew Cohen <cohen@andy.bu.edu>]

[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]

>>>>> "Lars" == Lars Magne Ingebrigtsen <larsi@gnus.org> writes:

    Lars> Vegard Vesterheim <vegard.vesterheim@uninett.no> writes:
    >> I have, however, done a simple modification to the actual search
    >> function (nnir-run-imap).  I like to express my search criteria
    >> in IMAP syntax directly as IMAP itself supports a query language
    >> of sorts. I am not sure I see the need to invent another, more
    >> limited, mini-query-language implemented in elisp, at least not
    >> until it can be supported with a nice GUI for building complex
    >> queries.
    >> 

    Lars> I think that sounds very useful.  Could you post the patch
    Lars> here?  And have you (or are you willing to) sign copyright
    Lars> assignment papers for the code to the FSF (if the code is
    Lars> long-ish)?


I thought this sounded useful as well, so here is a very simple
implementation. If you use "G G" in the group buffer with a prefix arg
you get queried for the search string, and then queried for the field to
search in (e.g. Subject, From, Header). I've changed this so that if you
enter nothing for the field it interprets the search as a raw imap
search.

If you want raw imap searches to be the default for all queries (even
without using a prefix arg) just set nnir-imap-search-field to "".


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: nnir.el --]
[-- Type: text/x-diff, Size: 1199 bytes --]

diff --git a/lisp/nnir.el b/lisp/nnir.el
index ec22c78..db8b397 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -345,14 +345,16 @@
 (gnus-declare-backend "nnir" 'mail)
 
 (defvar nnir-imap-search-field "TEXT"
-  "The IMAP search item when doing an nnir search")
+  "The IMAP search item when doing an nnir search. To use raw
+  imap queries by default set this to \"\"")
 
 (defvar nnir-imap-search-arguments
   '(("Whole message" . "TEXT")
     ("Subject" . "SUBJECT")
     ("To" . "TO")
     ("From" . "FROM")
-    (nil . "HEADER \"%s\""))
+    ("Head" . "HEADER \"%s\"")
+    (nil . ""))
   "Mapping from user readable strings to IMAP search items for use in nnir")
 
 (defvar nnir-imap-search-argument-history ()
@@ -981,8 +983,11 @@ details on the language and supported extensions"
 	      (message "Searching %s..." group)
 	      (let ((arts 0)
 		    (result
-		     (nnimap-command "UID SEARCH  %s" 
-				     (nnir-imap-make-query criteria qstring))))
+		     (nnimap-command "UID SEARCH  %s"
+				     (if (string= criteria "")
+					 qstring
+				       (nnir-imap-make-query criteria qstring)
+				       ))))
 		(mapc
 		 (lambda (artnum)
 		   (push (vector group artnum 1) artlist)