Re: [PATCH] gnus: New variable nnir-swish-e-index-files to support multiple index files

Re: [PATCH] gnus: New variable nnir-swish-e-index-files to support multiple index files

[Reiner Steib]

On Sat, Nov 19 2005, Adrian Aichner wrote:

> the motivation for this patch is the forbidding cost of merging tiny
> incremental swish-e index files will my hefty initial full index,
> measuring 878318KB.
>
> Seems like using multiple index files, as supported by swish-e's -f
> switch is the obvious way out.
>
> I have successfully tested this patch with
> emacs-version "21.5  (beta23) \"daikon\" (+CVS-20051031) XEmacs Lucid"
> gnus-version "Gnus v5.10.7"
> in a native windows build today.
>
> Would be great if this patch could be considered.
>
> I'm willing to make some adjustments, if necessary.
>
> In particular I tested index files in directories containing spaces,
> and it works fine.

Maybe we should document in it's doc string that
`nnir-swish-e-index-file' is ignored if `nnir-swish-e-index-files' is
changed.

Else the patch looks fine to me.

Bye, Reiner.

[ Full quote of the patch follows because of redirection to ding. ]

> gnus ChangeLog patch:
> Diff command:   cvs -q diff -U 0
> Files affected: contrib/ChangeLog
>
> Index: contrib/ChangeLog
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/contrib/ChangeLog,v
> retrieving revision 7.19
> diff -u -U0 -r7.19 ChangeLog
> --- contrib/ChangeLog	17 May 2005 08:02:03 -0000	7.19
> +++ contrib/ChangeLog	19 Nov 2005 19:50:33 -0000
> @@ -0,0 +1,7 @@
> +2005-11-19  Adrian Aichner  <adrian@xemacs.org>
> +
> +	* nnir.el: New variable nnir-swish-e-index-files to support
> +	multiple swish-e index files.
> +	* nnir.el (nnir-swish-e-index-files): New.
> +	* nnir.el (nnir-run-swish-e): Use nnir-swish-e-index-files.
> +
>
> gnus source patch:
> Diff command:   cvs -f -z3 -q diff -u -w -N
> Files affected: contrib/nnir.el
>
> Index: contrib/nnir.el
> ===================================================================
> RCS file: /usr/local/cvsroot/gnus/contrib/nnir.el,v
> retrieving revision 7.8
> diff -u -w -r7.8 nnir.el
> --- contrib/nnir.el	6 Jul 2005 06:42:01 -0000	7.8
> +++ contrib/nnir.el	19 Nov 2005 19:49:30 -0000
> @@ -544,6 +544,13 @@
>    :type '(file)
>    :group 'nnir)
>
> +(defcustom nnir-swish-e-index-files
> +  (list nnir-swish-e-index-file)
> +  "*List of index files for swish-e.
> +This could be a server parameter."
> +  :type '(repeat (file))
> +  :group 'nnir)
> +
>  (defcustom nnir-swish-e-program "swish-e"
>    "*Name of swish-e search executable.
>  This cannot be a server parameter."
> @@ -1196,10 +1203,10 @@
>        (erase-buffer)
>
>        (message "Doing swish-e query %s..." query)
> -      (let* ((index-file
> +      (let* ((index-files
>  	      (or (nnir-read-server-parm
> -		   'nnir-swish-e-index-file server)
> -		  (error "Missing parameter `nnir-swish-e-index-file'")))
> +		   'nnir-swish-e-index-files server)
> +		  (error "Missing parameter `nnir-swish-e-index-files'")))
>  	     (additional-switches
>  	      (nnir-read-server-parm
>  	       'nnir-swish-e-additional-switches server))
> @@ -1207,7 +1214,7 @@
>  			nil		; input from /dev/null
>  			t		; output
>  			nil		; don't redisplay
> -			"-f" ,index-file
> +			"-f" ,@index-files
>  			,@additional-switches
>  			"-w"
>  			,qstring	; the query, in swish-e format