From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/61396 Path: news.gmane.org!not-for-mail From: Reiner Steib Newsgroups: gmane.emacs.gnus.general Subject: Re: [PATCH] gnus: New variable nnir-swish-e-index-files to support multiple index files Date: Sun, 20 Nov 2005 14:24:42 +0100 Message-ID: References: <4q68mmwb.fsf@smtprelay.t-online.de> Reply-To: Reiner Steib NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1132493518 13320 80.91.229.2 (20 Nov 2005 13:31:58 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sun, 20 Nov 2005 13:31:58 +0000 (UTC) Cc: bugs@gnus.org, ding@gnus.org Original-X-From: ding-owner+m9927@lists.math.uh.edu Sun Nov 20 14:31:56 2005 Return-path: Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by ciao.gmane.org with esmtp (Exim 4.43) id 1EdpGv-0003lF-68 for ding-account@gmane.org; Sun, 20 Nov 2005 14:30:21 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1EdpGe-0006dG-00; Sun, 20 Nov 2005 07:30:04 -0600 Original-Received: from nas01.math.uh.edu ([129.7.128.39]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1EdpE0-0006d8-00 for ding@lists.math.uh.edu; Sun, 20 Nov 2005 07:27:20 -0600 Original-Received: from quimby.gnus.org ([80.91.224.244]) by nas01.math.uh.edu with esmtp (Exim 4.52) id 1EdpDy-0002qz-4u for ding@lists.math.uh.edu; Sun, 20 Nov 2005 07:27:20 -0600 Original-Received: from mail.uni-ulm.de ([134.60.1.1]) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1EdpDv-0005VP-00; Sun, 20 Nov 2005 14:27:17 +0100 Original-Received: from bridgekeeper.physik.uni-ulm.de (bridgekeeper.physik.uni-ulm.de [134.60.10.123]) by mail.uni-ulm.de (8.13.4/8.13.4) with ESMTP id jAKDRDp6005174; Sun, 20 Nov 2005 14:27:13 +0100 (MET) Original-Received: from me (bridgekeeper.physik.uni-ulm.de [134.60.10.123]) by bridgekeeper.physik.uni-ulm.de (Postfix) with SMTP id 3E18010BEF; Sun, 20 Nov 2005 14:27:11 +0100 (CET) Original-Received: (nullmailer pid 7717 invoked by uid 170); Sun, 20 Nov 2005 13:24:42 -0000 Original-To: Adrian Aichner Mail-Followup-To: Adrian Aichner , ding@gnus.org X-Face: 1;h7XMU[7l}$T@J.D}5z*w8Tg'}B5ArAWc8>2X~otB;kOjKs8X%|hTC#dG:%Vpx")x7S/`v :VXU#fZW$X$zdhEU.RfVQ@<-m9IuN{Hm"fW{,5]6kR'M*vEs+{5Cj!L(JTRzA$(},?5J=sm;%Od (Adrian Aichner's message of "Sat, 19 Nov 2005 20:57:08 +0100") User-Agent: Gnus/5.110004 (No Gnus v0.4) Emacs/22.0.50 (gnu/linux) X-DCC--Metrics: gemini 1074; Body=3 Fuz1=3 Fuz2=3 X-Spam-Score: -2.6 (--) Precedence: bulk Original-Sender: ding-owner@lists.math.uh.edu Xref: news.gmane.org gmane.emacs.gnus.general:61396 Archived-At: 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 > + > + * 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