* [Patch] allowing nnir.el + swish-e to search gziped mails @ 2006-03-17 13:39 Sascha Wilde 2006-04-11 16:21 ` Lars Magne Ingebrigtsen 0 siblings, 1 reply; 15+ messages in thread From: Sascha Wilde @ 2006-03-17 13:39 UTC (permalink / raw) [-- Attachment #1: Type: text/plain, Size: 234 bytes --] This is a trivial patch for nnir.el from gnus/contrib/ it allows searching nnml mail groups with enabled file compression. Tested with gnus from latest GNU CVS Emacs. ps. please CC me in any reply, I'm not subscribed to this list. [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #2: nnir-compressed-files.patch --] [-- Type: text/x-patch, Size: 558 bytes --] diff -c /home/wilde/.emacs.d/nnir.el.orig /home/wilde/.emacs.d/nnir.el --- /home/wilde/.emacs.d/nnir.el.orig 2006-03-17 14:27:30.566757000 +0100 +++ /home/wilde/.emacs.d/nnir.el 2006-03-17 14:25:31.875339250 +0100 @@ -1248,7 +1248,7 @@ dirnam (file-name-directory (match-string 2))) ;; don't match directories - (when (string-match "^[0-9]+$" artno) + (when (string-match "^[0-9]+\\(\\.gz\\)?$" artno) (when (not (null dirnam)) ;; remove nnir-swish-e-remove-prefix from beginning of dirname [-- Attachment #3: Type: text/plain, Size: 74 bytes --] -- Sascha Wilde "C++ : an octopus made by nailing extra legs onto a dog" ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch] allowing nnir.el + swish-e to search gziped mails 2006-03-17 13:39 [Patch] allowing nnir.el + swish-e to search gziped mails Sascha Wilde @ 2006-04-11 16:21 ` Lars Magne Ingebrigtsen 2006-05-31 22:12 ` Reiner Steib 0 siblings, 1 reply; 15+ messages in thread From: Lars Magne Ingebrigtsen @ 2006-04-11 16:21 UTC (permalink / raw) Sascha Wilde <wilde@sha-bang.de> writes: > This is a trivial patch for nnir.el from gnus/contrib/ > it allows searching nnml mail groups with enabled file compression. Thanks for the patch; I've applied it to No Gnus v0.5 (i. e., CVS). -- (domestic pets only, the antidote for overdose, milk.) larsi@gnus.org * Lars Magne Ingebrigtsen ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch] allowing nnir.el + swish-e to search gziped mails 2006-04-11 16:21 ` Lars Magne Ingebrigtsen @ 2006-05-31 22:12 ` Reiner Steib 2006-06-01 7:42 ` Sascha Wilde 0 siblings, 1 reply; 15+ messages in thread From: Reiner Steib @ 2006-05-31 22:12 UTC (permalink / raw) Cc: Sascha Wilde On Tue, Apr 11 2006, Lars Magne Ingebrigtsen wrote: > Sascha Wilde <wilde@sha-bang.de> writes: > >> This is a trivial patch for nnir.el from gnus/contrib/ >> it allows searching nnml mail groups with enabled file compression. > > Thanks for the patch; I've applied it to No Gnus v0.5 (i. e., CVS). I've changed it to match .bz2 and thelike as well in the trunk: (when (string-match "^[0-9]+\\(\\.[a-z0-9]+\\)?$" artno) ;; nnml-use-compressed-files might be any string, but probably this ;; is sufficient. Note that we can't only use the value of ;; nnml-use-compressed-files because old articles might have been ;; saved with a different value. Do you see any problem with this change? Else, I'll port this changes to v5-10/Emacs as well. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch] allowing nnir.el + swish-e to search gziped mails 2006-05-31 22:12 ` Reiner Steib @ 2006-06-01 7:42 ` Sascha Wilde 2006-06-01 12:27 ` Reiner Steib 2006-06-01 12:27 ` Including nnir.el (was: [Patch] allowing nnir.el + swish-e to search gziped mails) Reiner Steib 0 siblings, 2 replies; 15+ messages in thread From: Sascha Wilde @ 2006-06-01 7:42 UTC (permalink / raw) Reiner Steib <reinersteib+gmane@imap.cc> wrote: > On Tue, Apr 11 2006, Lars Magne Ingebrigtsen wrote: > >> Sascha Wilde <wilde@sha-bang.de> writes: >> >>> This is a trivial patch for nnir.el from gnus/contrib/ >>> it allows searching nnml mail groups with enabled file compression. >> >> Thanks for the patch; I've applied it to No Gnus v0.5 (i. e., CVS). > > I've changed it to match .bz2 and thelike as well in the trunk: Are there actually any backends able to use bz2 compression, or any files with an other suffix than .gz for that matter? > (when (string-match "^[0-9]+\\(\\.[a-z0-9]+\\)?$" artno) > ;; nnml-use-compressed-files might be any string, but probably this > ;; is sufficient. Note that we can't only use the value of > ;; nnml-use-compressed-files because old articles might have been > ;; saved with a different value. > > Do you see any problem with this change? Else, I'll port this changes > to v5-10/Emacs as well. On a first glance I can't see any problems beside the fact, that it matches nearly every possible suffix, but I'd guess that's the intention... ;-) btw. nnir.el isn't part of Emacs yet, which IMO is a pity. cheers sascha -- Sascha Wilde Programmer - A red-eyed, mumbling mammal capable of conversing with inanimate objects. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [Patch] allowing nnir.el + swish-e to search gziped mails 2006-06-01 7:42 ` Sascha Wilde @ 2006-06-01 12:27 ` Reiner Steib 2006-06-01 12:27 ` Including nnir.el (was: [Patch] allowing nnir.el + swish-e to search gziped mails) Reiner Steib 1 sibling, 0 replies; 15+ messages in thread From: Reiner Steib @ 2006-06-01 12:27 UTC (permalink / raw) Cc: ding On Thu, Jun 01 2006, Sascha Wilde wrote: > Reiner Steib <reinersteib+gmane@imap.cc> wrote: >> Else, I'll port this changes to v5-10/Emacs as well. Correction: nnir.el isn't synced with Emacs up to now, see below. >> I've changed it to match .bz2 and thelike as well in the trunk: > > Are there actually any backends able to use bz2 compression, or any > files with an other suffix than .gz for that matter? In the development version (No Gnus) we have: ,----[ (info "(gnus)No Gnus") ] | * The nnml back end allows other compression programs beside | `gzip' for compressed message files. *Note Mail Spool::. `---- ,----[ (info "(gnus)Mail Spool") ] | `nnml-use-compressed-files' | If non-`nil', `nnml' will allow using compressed message files. | This requires `auto-compression-mode' to be enabled (*note | Compressed Files: (emacs)Compressed Files.). If the value of | `nnml-use-compressed-files' is a string, it is used as the file | extension specifying the comression program. You can set it to | `.bz2' if your Emacs supports it. A value of `t' is equivalent to | `.gz'. `---- Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Including nnir.el (was: [Patch] allowing nnir.el + swish-e to search gziped mails) 2006-06-01 7:42 ` Sascha Wilde 2006-06-01 12:27 ` Reiner Steib @ 2006-06-01 12:27 ` Reiner Steib 2006-06-01 13:36 ` Including nnir.el Sascha Wilde 2006-06-04 18:01 ` Sascha Wilde 1 sibling, 2 replies; 15+ messages in thread From: Reiner Steib @ 2006-06-01 12:27 UTC (permalink / raw) Cc: ding On Thu, Jun 01 2006, Sascha Wilde wrote: > btw. nnir.el isn't part of Emacs yet, which IMO is a pity. Would you like to work on the integration? What needs to be done is basically: - Kai Grossjohann <kai@emptydomain.de> and Christoph Conrad <christoph.conrad@gmx.de> both have papers on file for Emacs. Contact them and ask if there are any changes by other people in nnir.el which are not documented in contrib/ChangeLog (i.e. before nnir.el was added to contrib/). If there are such changes, check if these are tiny changes (upto 10-15 lines) or if the author has papers on file or is willing to sign. The thread [1] is the most recent statement on this, IIRC. - Fix the copyright statements in the file accordingly. Currently the copyright statements are spread all over the file. I don't think this is correct. And at least the years 2004-2006 need to be added. - Find out which search engines are Free Software (cf. www.gnu.org). Remove glimpse and other non-free search engines. See [2]. Anything else? Bye, Reiner. [1] ,----[ http://thread.gmane.org/gmane.emacs.gnus.general/58422/focus=58962 ] | From: Kai Grossjohann <kai@emptydomain.de> | Subject: Re: nnir.el? | Newsgroups: gmane.emacs.gnus.general | Date: Sat, 23 Oct 2004 22:54:14 +0200 | Message-ID: <86lldxp349.fsf@ketchup.de.uu.net> | | [...] | | I once thought that there were other changes, but it turned out that | Christoph was so productive that I thought he was three people ;-) | | Since Christoph and me both have the paperwork, it would be possible | to incorporate nnir.el into the mainstream. | | However, I confess that I'm not that happy with nnir.el. The | infrastructure sucks, especially regarding all the parameters that you | have to set up. gnus-namazu.el manages to do things without any | configuration. | | [...] | | That said, I don't want to denigrate people of something they find | useful. `---- [2] ,----[ http://thread.gmane.org/21753.1067306464%40newt.com ] | From: Bill Wohler <wohler@newt.com> | Subject: Re: RMAIL, MIME-related bug | Newsgroups: gmane.emacs.devel | Date: Mon, 27 Oct 2003 18:01:04 -0800 | Message-ID: <21753.1067306464@newt.com> | Original-To: rms@gnu.org | | Richard Stallman <rms@gnu.org> writes: | | > I am a huge fan of mail indexing programs like: swish++, mairix, | > glimpse, namazu etc. | > | > I seem to recall that glimpse is or was non-free. I don't know about | > the others. Can you check which of these are non-free? We don't | > want Gnus or MH-E to refer to them. | | Glimpse support was dropped from CVS MH-E today. | | A poll of MH-E users revealed one glimpse user who was going to switch | to another indexer anyway, and another who was happy to switch, so there | wasn't much pain involved. I use swish++ myself. `---- -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-01 12:27 ` Including nnir.el (was: [Patch] allowing nnir.el + swish-e to search gziped mails) Reiner Steib @ 2006-06-01 13:36 ` Sascha Wilde 2006-06-11 10:59 ` Sascha Wilde 2006-06-04 18:01 ` Sascha Wilde 1 sibling, 1 reply; 15+ messages in thread From: Sascha Wilde @ 2006-06-01 13:36 UTC (permalink / raw) Reiner Steib <reinersteib+gmane@imap.cc> wrote: > On Thu, Jun 01 2006, Sascha Wilde wrote: > >> btw. nnir.el isn't part of Emacs yet, which IMO is a pity. > > Would you like to work on the integration? Yes, I'll do so. (thanks for the use full pointers). Please note: I tend to be less responsive than I'd like to be... ;-) cheers sascha -- Sascha Wilde Die Existenz von Spam heißt, daß ein Medium noch lebt. Die Existenz von Pr0n heißt, daß es Zukunft hat. -- Leitners Law (<40f7d168@fefe.de>, 16. Juli 2004) ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-01 13:36 ` Including nnir.el Sascha Wilde @ 2006-06-11 10:59 ` Sascha Wilde 2006-06-12 21:59 ` Andreas Seltenreich 0 siblings, 1 reply; 15+ messages in thread From: Sascha Wilde @ 2006-06-11 10:59 UTC (permalink / raw) [-- Attachment #1: Type: text/plain, Size: 645 bytes --] Sascha Wilde <wilde@sha-bang.de> wrote: > Reiner Steib <reinersteib+gmane@imap.cc> wrote: >> Would you like to work on the integration? > > Yes, I'll do so. (thanks for the use full pointers). Ok, here is the first patch. I verified that there are no undocumented contributions, removed non free backends and updates copyright information. (Documentation will follow later...) IMPORTAINT: please double check that my changes to the copyright are right, I'm not sure if it is ok to change the copyright retroactively to the fsf. @Reiner: I guess we have papers from Simon Josefsson on file, so the imap backend should be no problem? sascha [-- Attachment #2: Patch for official integration of nnir --] [-- Type: text/x-patch, Size: 16639 bytes --] Index: contrib/ChangeLog =================================================================== RCS file: /usr/local/cvsroot/gnus/contrib/ChangeLog,v retrieving revision 7.33 diff -u -r7.33 ChangeLog --- contrib/ChangeLog 10 Jun 2006 03:36:21 -0000 7.33 +++ contrib/ChangeLog 11 Jun 2006 10:39:53 -0000 @@ -1,3 +1,9 @@ +2006-06-11 Sascha Wilde <wilde@sha-bang.de> + + * nnir.el: Removed support for non free backends glimpse and excite. + * nnir.el: Changed and updated copyright to Free Software Foundation. + Moved all authors to head. + 2006-06-10 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de> * nnir.el (nnir-read-server-parm): Do not unconditionally fall back to Index: contrib/nnir.el =================================================================== RCS file: /usr/local/cvsroot/gnus/contrib/nnir.el,v retrieving revision 7.18 diff -u -r7.18 nnir.el --- contrib/nnir.el 10 Jun 2006 03:36:21 -0000 7.18 +++ contrib/nnir.el 11 Jun 2006 10:39:54 -0000 @@ -1,10 +1,16 @@ ;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*- -;; Copyright (C) 1998 Kai Großjohann + +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, +;; 2005, 2006 Free Software Foundation, Inc. ;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de> -;; Keywords: news, mail, searching, ir, glimpse, wais, hyrex +;; Swish-e and Swish++ backends by: +;; Christoph Conrad <christoph.conrad@gmx.de>. +;; Imap backend by: Simon Josefsson <jas@pdc.kth.se>. + +;; Keywords: news mail searching ir -;; This file is not part of GNU Emacs. +;; This file is part of GNU Emacs. ;; This is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -31,7 +37,7 @@ ;; with your ideas. ;; What does it do? Well, it allows you to index your mail using some -;; search engine (freeWAIS-sf, Glimpse and others -- see later), +;; search engine (freeWAIS-sf, swish-e and others -- see later), ;; then type `G G' in the Group buffer and issue a query to the search ;; engine. You will then get a buffer which shows all articles ;; matching the query, sorted by Retrieval Status Value (score). @@ -55,7 +61,6 @@ ;; others doesn't support nnfolder. ;; * It can only search the mail backend's which are supported by one ;; search engine, because of different query languages. -;; * There are restrictions to the Glimpse setup. ;; * There are restrictions to the Wais setup. ;; * There are restrictions to the imap setup. ;; * gnus-summary-nnir-goto-thread: Fetches whole group first, before @@ -156,18 +161,7 @@ ;; this prefix. It defaults to `$HOME/Mail/' (note the trailing ;; slash). -;; 2. Glimpse -;; -;; The code expects you to have one Glimpse index which contains all -;; your mail files. The Lisp setup involves setting the -;; `nnir-glimpse-*' variables. The most difficult to understand -;; variable is probably `nnir-glimpse-remove-prefix', it corresponds -;; to `nnir-wais-remove-prefix', see above. The `nnir-glimpse-home' -;; variable should be set to the value of the `-H' option which allows -;; one to search this Glimpse index. I have indexed my whole home -;; directory with Glimpse, so I assume a default of `$HOME'. - -;; 3. Namazu +;; 2. Namazu ;; ;; The Namazu backend requires you to have one directory containing all ;; index files, this is controlled by the `nnir-namazu-index-directory' @@ -211,7 +205,7 @@ ;; For maximum searching efficiency I have a cron job set to run this ;; command every four hours. -;; 4. HyREX +;; 3. HyREX ;; ;; The HyREX backend requires you to have one directory from where all ;; your relative paths are to, if you use them. This directory must be @@ -242,7 +236,7 @@ ;; the second element should be the article number, and the third ;; element should be the Retrieval Status Value (RSV) as returned from ;; the search engine. An RSV is the score assigned to the document by -;; the search engine. For Boolean search engines like Glimpse, the +;; the search engine. For Boolean search engines, the ;; RSV is always 1000 (or 1 or 100, or whatever you like). ;; The sorting order of the articles in the summary buffer created by @@ -261,8 +255,6 @@ ;; Todo, or future ideas: -;; * Make it so that Glimpse can also be called without `-F'. -;; ;; * It should be possible to restrict search to certain groups. ;; ;; * There is currently no error checking. @@ -330,12 +322,8 @@ ;;; Developer Extension Variable: (defvar nnir-engines - `((glimpse nnir-run-glimpse - ((group . "Group spec: "))) - (wais nnir-run-waissearch + `((wais nnir-run-waissearch ()) - (excite nnir-run-excite-search - ()) (imap nnir-run-imap ((criteria "Search in: " ; Prompt @@ -376,7 +364,7 @@ ;;; User Customizable Variables: (defgroup nnir nil - "Search nnmh and nnml groups in Gnus with Glimpse, freeWAIS-sf, or EWS." + "Search nnmh and nnml groups in Gnus with swish-e, freeWAIS-sf, or EWS." :group 'gnus) ;; Mail backend. @@ -407,47 +395,6 @@ :type '(sexp) :group 'nnir) -;; Glimpse engine. - -(defcustom nnir-glimpse-program "glimpse" - "*Name of Glimpse executable." - :type '(string) - :group 'nnir) - -(defcustom nnir-glimpse-home (getenv "HOME") - "*Value of `-H' glimpse option. -`~' and environment variables must be expanded, see the functions -`expand-file-name' and `substitute-in-file-name'." - :type '(directory) - :group 'nnir) - -(defcustom nnir-glimpse-remove-prefix (concat (getenv "HOME") "/Mail/") - "*The prefix to remove from each file name returned by Glimpse -in order to get a group name (albeit with / instead of .). This is a -regular expression. - -For example, suppose that Glimpse returns file names such as -\"/home/john/Mail/mail/misc/42\". For this example, use the following -setting: (setq nnir-glimpse-remove-prefix \"/home/john/Mail/\") -Note the trailing slash. Removing this prefix gives \"mail/misc/42\". -`nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to -arrive at the correct group name, \"mail.misc\"." - :type '(regexp) - :group 'nnir) - -(defcustom nnir-glimpse-additional-switches '("-i") - "*A list of strings, to be given as additional arguments to glimpse. -The switches `-H', `-W', `-l' and `-y' are always used -- calling -glimpse without them does not make sense in our situation. -Suggested elements to put here are `-i' and `-w'. - -Note that this should be a list. Ie, do NOT use the following: - (setq nnir-glimpse-additional-switches \"-i -w\") ; wrong! -Instead, use this: - (setq nnir-glimpse-additional-switches '(\"-i\" \"-w\"))" - :type '(repeat (string)) - :group 'nnir) - ;; freeWAIS-sf. (defcustom nnir-wais-program "waissearch" @@ -470,37 +417,15 @@ in order to get a group name (albeit with / instead of .). This is a regular expression. -This variable is similar to `nnir-glimpse-remove-prefix', only for Wais, -not Glimpse." - :type '(regexp) - :group 'nnir) - -;; EWS (Excite for Web Servers) engine. - -(defcustom nnir-excite-aquery-program "aquery.pl" - "*Name of the EWS query program. Should be `aquery.pl' or a path to same." - :type '(string) - :group 'nnir) - -(defcustom nnir-excite-collection "Mail" - "*Name of the EWS collection to search." - :type '(string) - :group 'nnir) - -(defcustom nnir-excite-remove-prefix (concat (getenv "HOME") "/Mail/") - "*The prefix to remove from each file name returned by EWS -in order to get a group name (albeit with / instead of .). This is a -regular expression. - -This variable is very similar to `nnir-glimpse-remove-prefix', except -that it is for EWS, not Glimpse." +For example, suppose that Wais returns file names such as +\"/home/john/Mail/mail/misc/42\". For this example, use the following +setting: (setq nnir-wais-remove-prefix \"/home/john/Mail/\") +Note the trailing slash. Removing this prefix gives \"mail/misc/42\". +`nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to +arrive at the correct group name, \"mail.misc\"." :type '(regexp) :group 'nnir) -;; Swish++. Next three variables Copyright (C) 2000, 2001 Christoph -;; Conrad <christoph.conrad@gmx.de>. -;; Swish++ home page: http://homepage.mac.com/pauljlucas/software/swish/ - (defcustom nnir-swish++-configuration-file (expand-file-name "~/Mail/swish++.conf") "*Configuration file for swish++." @@ -527,8 +452,8 @@ in order to get a group name (albeit with / instead of .). This is a regular expression. -This variable is very similar to `nnir-glimpse-remove-prefix', except -that it is for swish++, not Glimpse." +This variable is very similar to `nnir-wais-remove-prefix', except +that it is for swish++, not Wais." :type '(regexp) :group 'nnir) @@ -537,7 +462,6 @@ ;; New version: http://www.boe.es/swish-e ;; Variables `nnir-swish-e-index-file', `nnir-swish-e-program' and ;; `nnir-swish-e-additional-switches' -;; Copyright (C) 2000 Christoph Conrad <christoph.conrad@gmx.de>. (make-obsolete-variable 'nnir-swish-e-index-file 'nnir-swish-e-index-files) @@ -580,8 +504,8 @@ in order to get a group name (albeit with / instead of .). This is a regular expression. -This variable is very similar to `nnir-glimpse-remove-prefix', except -that it is for swish-e, not Glimpse. +This variable is very similar to `nnir-wais-remove-prefix', except +that it is for swish-e, not Wais. This could be a server parameter." :type '(regexp) @@ -649,8 +573,8 @@ "*The prefix to remove from each file name returned by Namazu in order to get a group name (albeit with / instead of .). -This variable is very similar to `nnir-glimpse-remove-prefix', except -that it is for Namazu, not Glimpse." +This variable is very similar to `nnir-wais-remove-prefix', except +that it is for Namazu, not Wais." :type '(directory) :group 'nnir) @@ -885,77 +809,6 @@ ;;; Search Engine Interfaces: -;; Glimpse interface. -(defun nnir-run-glimpse (query server &optional group) - "Run given query against glimpse. Returns a vector of (group name, file name) -pairs (also vectors, actually)." - (save-excursion - (let ((artlist nil) - (groupspec (cdr (assq 'group query))) - (qstring (cdr (assq 'query query))) - (prefix (nnir-read-server-parm 'nnir-glimpse-remove-prefix server)) - artno dirnam) - (when (and group groupspec) - (error (concat "It does not make sense to use a group spec" - " with process-marked groups."))) - (when group - (setq groupspec (gnus-group-real-name group))) - (set-buffer (get-buffer-create nnir-tmp-buffer)) - (erase-buffer) - (if groupspec - (message "Doing glimpse query %s on %s..." query groupspec) - (message "Doing glimpse query %s..." query)) - (let* ((cp-list - `( ,nnir-glimpse-program - nil ; input from /dev/null - t ; output - nil ; don't redisplay - "-H" ,(nnir-read-server-parm 'nnir-glimpse-home server) ; search home dir - "-W" ; match pattern in file - "-l" "-y" ; misc options - ,@(nnir-read-server-parm 'nnir-glimpse-additional-switches server) - "-F" ,prefix ; restrict output to mail - ,qstring ; the query, in glimpse format - )) - (exitstatus - (progn - (message "%s args: %s" nnir-glimpse-program - (mapconcat 'identity (cddddr cp-list) " ")) - (apply 'call-process cp-list)))) - (unless (or (null exitstatus) - (zerop exitstatus)) - (nnheader-report 'nnir "Couldn't run glimpse: %s" exitstatus) - ;; Glimpse failure reason is in this buffer, show it if - ;; the user wants it. - (when (> gnus-verbose 6) - (display-buffer nnir-tmp-buffer)))) - (when groupspec - (keep-lines groupspec)) - (if groupspec - (message "Doing glimpse query %s on %s...done" query groupspec) - (message "Doing glimpse query %s...done" query)) - (sit-for 0) - ;; remove superfluous stuff from glimpse output - (goto-char (point-min)) - (delete-non-matching-lines "/[0-9]+$") - ;;(delete-matching-lines "\\.overview~?$") - (goto-char (point-min)) - (while (re-search-forward (concat "^" prefix "\\(.+\\)" "/\\([0-9]\\)+$") nil t) - ;; replace / with . in group names - (setq dirnam (substitute ?. ?/ (match-string 1)) - artno (match-string 2)) - (push (vector (nnir-group-full-name dirnam server) - (string-to-int artno)) artlist)) - - (sort* artlist - (function (lambda (x y) - (if (string-lessp (nnir-artitem-group x) - (nnir-artitem-group y)) - t - (< (nnir-artitem-number x) - (nnir-artitem-number y)))))) - ))) - ;; freeWAIS-sf interface. (defun nnir-run-waissearch (query server &optional group) "Run given query agains waissearch. Returns vector of (group name, file name) @@ -1001,50 +854,7 @@ (> (nnir-artitem-rsv x) (nnir-artitem-rsv y))))))))) -;; EWS (Excite for Web Servers) interface -(defun nnir-run-excite-search (query server &optional group) - "Run a given query against EWS. Returns vector of (group name, file name) -pairs (also vectors, actually)." - (when group - (error "Searching specific groups not implemented for EWS.")) - (save-excursion - (let ((qstring (cdr (assq 'query query))) - (prefix (nnir-read-server-parm 'nnir-excite-remove-prefix server)) - artlist group article-num article) - (setq nnir-current-query query) - (set-buffer (get-buffer-create nnir-tmp-buffer)) - (erase-buffer) - (message "Doing EWS query %s..." qstring) - (call-process nnir-excite-aquery-program - nil ; input from /dev/null - t ; output to current buffer - nil ; don't redisplay - (nnir-read-server-parm 'nnir-excite-collection server) - (if (string= (substring qstring 0 1) "(") - qstring - (format "(concept %s)" qstring))) - (message "Gathering query output...") - - (goto-char (point-min)) - (while (re-search-forward - "^[0-9]+\\s-[0-9]+\\s-[0-9]+\\s-\\(\\S-*\\)" nil t) - (setq article (match-string 1)) - (unless (string-match - (concat "^" (regexp-quote prefix) - "\\(.*\\)/\\([0-9]+\\)") article) - (nnheader-report 'nnir "Dir name %s doesn't contain prefix %s" - article prefix)) - (setq group (substitute ?. ?/ (match-string 1 article))) - (setq group (nnir-group-full-name group server)) - (setq article-num (match-string 2 article)) - (setq artlist (vconcat artlist (vector (vector group - (string-to-int article-num) - 1000))))) - (message "Gathering query output...done") - artlist))) - -;; IMAP interface. The following function is Copyright (C) 1998 Simon -;; Josefsson <jas@pdc.kth.se>. +;; IMAP interface. ;; todo: ;; nnir invokes this two (2) times???! ;; we should not use nnimap at all but open our own server connection @@ -1081,8 +891,7 @@ (quit nil)) (reverse artlist)))) -;; Swish++ interface. The following function is Copyright (C) 2000, -;; 2001 Christoph Conrad <christoph.conrad@gmx.de>. +;; Swish++ interface. ;; -cc- Todo ;; Search by ;; - group @@ -1192,8 +1001,7 @@ (> (nnir-artitem-rsv x) (nnir-artitem-rsv y))))))))) -;; Swish-E interface. The following function is Copyright (C) 2000, -;; 2001 by Christoph Conrad <christoph.conrad@gmx.de>. +;; Swish-E interface. (defun nnir-run-swish-e (query server &optional group) "Run given query against swish-e. Returns a vector of (group name, file name) pairs (also vectors, [-- Attachment #3: Type: text/plain, Size: 158 bytes --] -- Sascha Wilde Wer HTML postet oder gepostetes HTML quotet oder sich gepostetes oder gequotetes HTML beschafft, um es in Verkehr zu bringen, wird geplonkt. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-11 10:59 ` Sascha Wilde @ 2006-06-12 21:59 ` Andreas Seltenreich 2006-06-19 17:16 ` Reiner Steib 0 siblings, 1 reply; 15+ messages in thread From: Andreas Seltenreich @ 2006-06-12 21:59 UTC (permalink / raw) Sascha Wilde <wilde@sha-bang.de> writes: > IMPORTAINT: please double check that my changes to the copyright are > right, I'm not sure if it is ok to change the copyright retroactively > to the fsf. > > @Reiner: I guess we have papers from Simon Josefsson on file, so the > imap backend should be no problem? How about Torsten Hilbrich? ISTM that he has worked on the imap part too: <news:871xu2pm54.fsf@myrkr.in-berlin.de>. regards, andreas ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-12 21:59 ` Andreas Seltenreich @ 2006-06-19 17:16 ` Reiner Steib 2006-07-03 7:06 ` Sascha Wilde 0 siblings, 1 reply; 15+ messages in thread From: Reiner Steib @ 2006-06-19 17:16 UTC (permalink / raw) Cc: Sascha Wilde, Adrian Aichner On Mon, Jun 12 2006, Andreas Seltenreich wrote: > Sascha Wilde <wilde@sha-bang.de> writes: > >> IMPORTAINT: please double check that my changes to the copyright are >> right, I'm not sure if it is ok to change the copyright retroactively >> to the fsf. Does anyone know how we need to handle this? If not, Sascha, could you please ask on emacs-devel? >> @Reiner: I guess we have papers from Simon Josefsson on file, Yes. >> so the imap backend should be no problem? > > How about Torsten Hilbrich? ISTM that he has worked on the imap part > too: <news:871xu2pm54.fsf@myrkr.in-berlin.de>. We have papers from Torsten Hilbrich. But there's the contribution of Adrian Aichner (2005-12-05). He was willing to sign papers and I've sent him the forms on May 31. I don't know what the current status is. Adrian? Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-19 17:16 ` Reiner Steib @ 2006-07-03 7:06 ` Sascha Wilde 2006-07-13 12:44 ` Sascha Wilde 2006-07-17 13:03 ` Reiner Steib 0 siblings, 2 replies; 15+ messages in thread From: Sascha Wilde @ 2006-07-03 7:06 UTC (permalink / raw) Cc: Adrian Aichner, Reiner.Steib Reiner Steib <reinersteib+gmane@imap.cc> wrote: > On Mon, Jun 12 2006, Andreas Seltenreich wrote: > >> Sascha Wilde <wilde@sha-bang.de> writes: >> >>> IMPORTAINT: please double check that my changes to the copyright are >>> right, I'm not sure if it is ok to change the copyright retroactively >>> to the fsf. > > Does anyone know how we need to handle this? If not, Sascha, could > you please ask on emacs-devel? OK, I asked on emacs-devel and got a reply by RMS: having only the fsf copyright notice, as in my patch, is correct -- so the patch can be applied now, if papers by every contributor are on file... > But there's the contribution of Adrian Aichner (2005-12-05). He was > willing to sign papers and I've sent him the forms on May 31. I don't > know what the current status is. Adrian? Any news on that? Adrian? Reiner? cheers sascha -- Sascha Wilde "C++ : an octopus made by nailing extra legs onto a dog" ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-07-03 7:06 ` Sascha Wilde @ 2006-07-13 12:44 ` Sascha Wilde 2006-07-17 13:03 ` Reiner Steib 1 sibling, 0 replies; 15+ messages in thread From: Sascha Wilde @ 2006-07-13 12:44 UTC (permalink / raw) Sascha Wilde <wilde@sha-bang.de> wrote: > Reiner Steib <reinersteib+gmane@imap.cc> wrote: [...] >> But there's the contribution of Adrian Aichner (2005-12-05). He was >> willing to sign papers and I've sent him the forms on May 31. I don't >> know what the current status is. Adrian? > > Any news on that? Adrian? Reiner? ping -- Sascha Wilde : The most exciting phrase to hear in science, the one : that heralds new discoveries, is not "Eureka!" (I found : it!) but "That's funny ..." -- Isaac Asimov ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-07-03 7:06 ` Sascha Wilde 2006-07-13 12:44 ` Sascha Wilde @ 2006-07-17 13:03 ` Reiner Steib 1 sibling, 0 replies; 15+ messages in thread From: Reiner Steib @ 2006-07-17 13:03 UTC (permalink / raw) Cc: ding On Mon, Jul 03 2006, Sascha Wilde wrote: > Reiner Steib <reinersteib+gmane@imap.cc> wrote: >>> Sascha Wilde <wilde@sha-bang.de> writes: >>> >>>> IMPORTAINT: please double check that my changes to the copyright are >>>> right, I'm not sure if it is ok to change the copyright retroactively >>>> to the fsf. >> >> Does anyone know how we need to handle this? If not, Sascha, could >> you please ask on emacs-devel? > > OK, I asked on emacs-devel and got a reply by RMS: having only the fsf > copyright notice, as in my patch, is correct -- so the patch can be > applied now, if papers by every contributor are on file... I've applied it in contrib now (trunk only). Sorry for the delay. >> But there's the contribution of Adrian Aichner (2005-12-05). He was >> willing to sign papers and I've sent him the forms on May 31. I don't >> know what the current status is. Adrian? > > Any news on that? Adrian? Reiner? I don't have any news from Adrian. There's no assignment listed yet. If we cannot get papers from Adrian, I will remove his contribution from nnir.el and move the file to lisp/. Else I will move the file as it is in contrib/ now to lisp/. Adrian, please tell us whether or not you intend to sign the assignment. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-01 12:27 ` Including nnir.el (was: [Patch] allowing nnir.el + swish-e to search gziped mails) Reiner Steib 2006-06-01 13:36 ` Including nnir.el Sascha Wilde @ 2006-06-04 18:01 ` Sascha Wilde 2006-06-05 22:49 ` Reiner Steib 1 sibling, 1 reply; 15+ messages in thread From: Sascha Wilde @ 2006-06-04 18:01 UTC (permalink / raw) Reiner Steib <reinersteib+gmane@imap.cc> wrote: > On Thu, Jun 01 2006, Sascha Wilde wrote: > >> btw. nnir.el isn't part of Emacs yet, which IMO is a pity. > > Would you like to work on the integration? > > What needs to be done is basically: [...] > Anything else? The one thing most hackers like to forget: Documentation. By now the documentation is only in the comments at the head of the source, I would use it as basis to cook up some minimal texinfo docs. Where in the existing gnus manual would this fit best? cheers sascha -- Sascha Wilde Nota bene: wenn Word für Längeres geeignet wäre, würde es schließlich nicht Word, sondern Sentence, Page oder Article heißen -- Matthias Mühlich in dctt ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: Including nnir.el 2006-06-04 18:01 ` Sascha Wilde @ 2006-06-05 22:49 ` Reiner Steib 0 siblings, 0 replies; 15+ messages in thread From: Reiner Steib @ 2006-06-05 22:49 UTC (permalink / raw) Cc: ding On Sun, Jun 04 2006, Sascha Wilde wrote: > The one thing most hackers like to forget: Documentation. By now the > documentation is only in the comments at the head of the source, I > would use it as basis to cook up some minimal texinfo docs. > > Where in the existing gnus manual would this fit best? Maybe (info "(gnus)Combined Groups") for a general description. `gnus-group-make-nnir-group' might be described in (info "(gnus)Foreign Groups") as well. Bye, Reiner. -- ,,, (o o) ---ooO-(_)-Ooo--- | PGP key available | http://rsteib.home.pages.de/ ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2006-07-17 13:03 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2006-03-17 13:39 [Patch] allowing nnir.el + swish-e to search gziped mails Sascha Wilde 2006-04-11 16:21 ` Lars Magne Ingebrigtsen 2006-05-31 22:12 ` Reiner Steib 2006-06-01 7:42 ` Sascha Wilde 2006-06-01 12:27 ` Reiner Steib 2006-06-01 12:27 ` Including nnir.el (was: [Patch] allowing nnir.el + swish-e to search gziped mails) Reiner Steib 2006-06-01 13:36 ` Including nnir.el Sascha Wilde 2006-06-11 10:59 ` Sascha Wilde 2006-06-12 21:59 ` Andreas Seltenreich 2006-06-19 17:16 ` Reiner Steib 2006-07-03 7:06 ` Sascha Wilde 2006-07-13 12:44 ` Sascha Wilde 2006-07-17 13:03 ` Reiner Steib 2006-06-04 18:01 ` Sascha Wilde 2006-06-05 22:49 ` Reiner Steib
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).