nnir.el cleanup (was Re: nnir.el swish++ interface broken)

[Justus@Piater.name]

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

Reiner Steib <reinersteib+gmane@imap.cc> wrote on Sat, 19 Apr 2008
19:36:57 +0200:

>     ;; eliminate all ".", "/", "\" from beginning. Always matches.
>     (string-match "^[./\\]*\\(.*\\)$" dirnam)
>     (setq group (substitute ?. ?/ (match-string 1 dirnam))) ;; "/" -> "."
>     (setq group (substitute ?. ?\\ group)) ;; "\\" -> "."
>
> I'm not sure what values of dirnam and group need to be considered.
> Maybe using `gnus-replace-in-string' could simplify this code?
>
> Additionally, `substitute' is a function from the `cl' package.  While
> it is okay to use cl macros at compile time[1], using cl at runtime.

This is not my code; I just moved it around during restructuring. But
how about the attached patch and the following change-log entry?

(nnir-compose-result): use `gnus-replace-in-string' instead of
`string-match', `match-string' and `substitute'

Christoph, can you verify that it still works for you? The changed
lines are irrelevant to the nnmaildir backend. You'll have to apply
the patch though; no more easy downloading of the full file :-):

>> I also updated the complete file on my Web server.
>
> I'd suggest not to distribute Gnus files on your Web server.  

(Of course, this was never intended to be a "distribution", just to
lower the barrier for testers.)

Justus


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

Index: nnir.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/contrib/nnir.el,v
retrieving revision 7.28
diff -u -r7.28 nnir.el
--- nnir.el	19 Apr 2008 17:19:12 -0000	7.28
+++ nnir.el	20 Apr 2008 07:35:24 -0000
@@ -880,10 +880,11 @@
     (setq dirnam
 	  (substring dirnam 0 (if (string= server "nnmaildir:") -5 -1)))
 
-    ;; eliminate all ".", "/", "\" from beginning. Always matches.
-    (string-match "^[./\\]*\\(.*\\)$" dirnam)
-    (setq group (substitute ?. ?/ (match-string 1 dirnam))) ;; "/" -> "."
-    (setq group (substitute ?. ?\\ group)) ;; "\\" -> "."
+    ;; Set group to dirnam without any leading dots or slashes,
+    ;; and with all subsequent slashes replaced by dots
+    (setq group (gnus-replace-in-string
+                 (gnus-replace-in-string dirnam "^[./\\]" "" t)
+                 "[/\\]" "." t))
 
     (vector (nnir-group-full-name group server)
 	    (if (string= server "nnmaildir:")