Re: Help testing gnus-search fixups

[Eric Abrahamsen <eric@ericabrahamsen.net>]

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

Eric Abrahamsen <eric@ericabrahamsen.net> writes:


[...]

> I'm getting to it! I just need to find a moment to sit down and set up
> some dummy data and test the various possible configurations. It
> shouldn't be to hard to unilaterally force prefixed group names where
> that's needed, and force unprefixed names elsewhere, I just need to
> find the time. I'd like to get this fixed once and for all.

Okay, I think I've finally got it. The incoming group names are indeed
prefixed or not depending on whether the server is primary or not
(arguably this should be fixed to always unprefixed in nnselect, but
I'll worry about that later), so this patch enforces unprefixed group
names within the function body, and prefixed group names in the return
value. Please give it a shot!

Eric


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: gnus-search-groups-fix.diff --]
[-- Type: text/x-patch, Size: 1172 bytes --]

diff --git a/lisp/gnus/gnus-search.el b/lisp/gnus/gnus-search.el
index 53af2f6fe6..d92122f2bd 100644
--- a/lisp/gnus/gnus-search.el
+++ b/lisp/gnus/gnus-search.el
@@ -1358,6 +1358,7 @@ gnus-search-indexed-parse-output
 						server query &optional groups)
   (let ((prefix (or (slot-value engine 'remove-prefix)
                     ""))
+        (groups (mapcar #'gnus-group-short-name groups))
 	artlist article group)
     (goto-char (point-min))
     ;; Prep prefix, we want to at least be removing the root
@@ -1404,10 +1405,12 @@ gnus-search-indexed-parse-output
       (setq artlist (gnus-search-grep-search engine artlist grep-reg)))
     ;; Munge into the list of vectors expected by nnselect.
     (mapcar (pcase-lambda (`(,_ ,article ,group ,score))
-              (vector group article
-                      (if (numberp score)
-			  score
-		        (string-to-number score))))
+              (vector
+               (gnus-group-full-name group server)
+               article
+               (if (numberp score)
+		   score
+		 (string-to-number score))))
             artlist)))
 
 (cl-defmethod gnus-search-indexed-extract ((_engine gnus-search-indexed))