From: Eric Abrahamsen <eric@ericabrahamsen.net>
Date: Tue, 2 May 2017 22:05:11 +0000 (-0700)
Subject: Create general gnus-search-indexed-massage-output method
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5e80a4da88adb14dc7c17e973f62fa0c4518dc90;p=emacs.git

Create general gnus-search-indexed-massage-output method

* lisp/gnus/gnus-search.el (gnus-search-indexed-massage-output): Take
  the namazu version, and install it as general for all
  gnus-search-indexed engines. Probably they all can use the same
  method, but I haven't taken the time to test them all yet.
---

diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index e2353a6e394..9145f9a39df 100644
--- a/lisp/gnus/gnus-search.el
+++ b/lisp/gnus/gnus-search.el
@@ -1374,6 +1374,46 @@ Returns a vector of [group name, file name, score] vectors."
 	(when (> gnus-verbose 6)
 	  (display-buffer buffer))))))
 
+(cl-defmethod gnus-search-indexed-massage-output ((engine gnus-search-indexed)
+						  server &optional groups)
+  "Common method for massaging filenames returned by indexed
+search engines.
+
+This method assumes that the engine returns a plain list of
+absolute filepaths to standard out."
+  ;; This method was originally the namazu-specific method.  I'm
+  ;; almost certain that all the engines can use this same method
+  ;; (meaning some fairly significant code reduction), but I haven't
+  ;; gone and tested them all yet.
+
+  ;; What if the server backend is nnml, and/or uses mboxes?
+  (let ((article-pattern (if (string-match "\\'nnmaildir:"
+					   (gnus-group-server server))
+			     ":[0-9]+"
+			   "^[0-9]+$"))
+	(prefix (slot-value engine 'prefix))
+	(group-regexp (when groups
+			(regexp-opt
+			 (mapcar
+			  (lambda (x) (gnus-group-real-name x))
+			  groups))))
+	score group article artlist)
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "^\\([0-9,]+\\.\\).*\\((score: \\([0-9]+\\)\\))\n\\([^ ]+\\)"
+	    nil t)
+      (setq score (match-string 3)
+	    group (file-name-directory (match-string 4))
+	    article (file-name-nondirectory (match-string 4)))
+
+      ;; make sure article and group is sane
+      (when (and (string-match article-pattern article)
+		 (not (null group))
+		 (or (null group-regexp)
+		     (string-match-p group-regexp group)))
+	(gnus-search-add-result group article score prefix server artlist)))
+    artlist))
+
 ;; Swish++
 
 (cl-defmethod gnus-search-transform-expression ((engine gnus-search-swish++)
@@ -1554,39 +1594,6 @@ Returns a vector of [group name, file name, score] vectors."
       ,index-dir ; index directory
       )))
 
-(cl-defmethod gnus-search-indexed-massage-output ((engine gnus-search-namazu)
-						  server &optional groups)
-  ;; Namazu output looks something like this:
-  ;; 2. Re: Gnus agent expire broken (score: 55)
-  ;; /home/henrik/Mail/mail/sent/1310 (4,138 bytes)
-
-  (let ((article-pattern (if (string-match "\\'nnmaildir:"
-					   (gnus-group-server server))
-			     ":[0-9]+"
-			   "^[0-9]+$"))
-	(prefix (slot-value engine 'prefix))
-	(group-regexp (when groups
-			(regexp-opt
-			 (mapcar
-			  (lambda (x) (gnus-group-real-name x))
-			  groups))))
-	score group article artlist)
-    (goto-char (point-min))
-    (while (re-search-forward
-	    "^\\([0-9,]+\\.\\).*\\((score: \\([0-9]+\\)\\))\n\\([^ ]+\\)"
-	    nil t)
-      (setq score (match-string 3)
-	    group (file-name-directory (match-string 4))
-	    article (file-name-nondirectory (match-string 4)))
-
-      ;; make sure article and group is sane
-      (when (and (string-match article-pattern article)
-		 (not (null group))
-		 (or (null group-regexp)
-		     (string-match-p group-regexp group)))
-	(gnus-search-add-result group article score prefix server artlist)))
-    artlist))
-
 ;;; Notmuch interface
 
 (cl-defmethod gnus-search-transform ((_engine gnus-search-notmuch)