Re: nnir-run-gmane search broken

[Matt Lundin <mdl@imapmail.org>]

Matt Lundin <mdl@imapmail.org> writes:

> Matt Lundin <mdl@imapmail.org> writes:
>
>> Andrew Cohen <cohen@andy.bu.edu> writes:
>>> 3. A compromise: go back to the crappy test of gmane in the server
>>>    name. Most of the time this will DTRT except when a user has the
>>>    string "gmane" in some server that isn't really news.gmane.org (or
>>>    snews.gmane.org). This has the defects of 2, but only in rare
>>>    cases.
>>
>> Could we simply check whether the nntp-address is defined? If so, then
>> the nntp-address must match "gmane.org$"; if not, then the server name
>> should match "gmane.org$". These are effectively the same test, since in
>> the shorter method of defining the server the name *is* the address. In
>> other words, if one uses a "nickname" (supergmane, gmaneman, etc.) for
>> some other nntp server, then one must define an nntp-address;
>> conversely, if one does not define an nntp-address, then the name of the
>> server has to be the full address. In either case, you are testing
>> against the address instead of some arbitrary name and thus can enforce
>> the stricter match ("gmane.org$").
>>
>
> I suppose I should have written "gmane\.org$" (or "gmane\\.org$" for the
> emacs-lisp). :)
>

Here's a brief patch that implements my rather verbose proposal above.

Best,
Matt

diff --git a/lisp/nnir.el b/lisp/nnir.el
index 726b015..820e565 100644
--- a/lisp/nnir.el
+++ b/lisp/nnir.el
@@ -1394,7 +1394,10 @@ Tested with Namazu 2.0.6 on a GNU/Linux system."
 ;; gmane interface
 (defun nnir-run-gmane (query srv &optional groups)
   "Run a search against a gmane back-end server."
-  (if (gnus-string-match-p  "gmane" srv)
+  (if (gnus-string-match-p
+       "gmane\\.org$"
+       (or (cadr (assoc 'nntp-address (cddr (gnus-server-to-method srv))))
+	   srv))
       (let* ((case-fold-search t)
 	     (qstring (cdr (assq 'query query)))
 	     (server (cadr (gnus-server-to-method srv)))