Mercurial > emacs
annotate lisp/gnus/nnir.el @ 111669:ed117caa918e
Merge changes made in Gnus trunk.
nnir.el: Fix typo in comments.
(nnir-run-imap): Simplify code. No need to reverse artlist.
(nnir-run-gmane): Use nnir-tmp-buffer for web results.
gnus-srvr.el (gnus-server-show-server): New command and keystroke.
nnimap.el (nnimap-get-capabilities): Refactor out.
(nnimap-open-connection): Re-request capabilities after STARTTLS.
gnus.texi (Server Commands): Document gnus-server-show-server.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 21 Nov 2010 22:46:16 +0000 |
parents | 4273d2312244 |
children | f97704487fb3 |
rev | line source |
---|---|
95610 | 1 ;;; nnir.el --- search mail with various search engines -*- coding: iso-8859-1 -*- |
2 | |
95616 | 3 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
106815 | 4 ;; 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
95610 | 5 |
6 ;; Author: Kai Großjohann <grossjohann@ls6.cs.uni-dortmund.de> | |
7 ;; Swish-e and Swish++ backends by: | |
8 ;; Christoph Conrad <christoph.conrad@gmx.de>. | |
9 ;; IMAP backend by: Simon Josefsson <jas@pdc.kth.se>. | |
10 ;; IMAP search by: Torsten Hilbrich <torsten.hilbrich <at> gmx.net> | |
11 ;; IMAP search improved by Daniel Pittman <daniel@rimspace.net>. | |
12 ;; nnmaildir support for Swish++ and Namazu backends by: | |
13 ;; Justus Piater <Justus <at> Piater.name> | |
95616 | 14 ;; Keywords: news mail searching ir |
15 | |
16 ;; This file is part of GNU Emacs. | |
17 | |
18 ;; GNU Emacs is free software: you can redistribute it and/or modify | |
19 ;; it under the terms of the GNU General Public License as published by | |
20 ;; the Free Software Foundation, either version 3 of the License, or | |
21 ;; (at your option) any later version. | |
22 | |
23 ;; GNU Emacs is distributed in the hope that it will be useful, | |
24 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
25 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
26 ;; GNU General Public License for more details. | |
27 | |
28 ;; You should have received a copy of the GNU General Public License | |
29 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |
30 | |
31 ;;; Commentary: | |
95610 | 32 |
33 ;; TODO: Documentation in the Gnus manual | |
34 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
35 ;; Where in the existing gnus manual would this fit best? |
95610 | 36 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
37 ;; What does it do? Well, it allows you to search your mail using |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
38 ;; some search engine (imap, namazu, swish-e, gmane and others -- see |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
39 ;; later) by typing `G G' in the Group buffer. You will then get a |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
40 ;; buffer which shows all articles matching the query, sorted by |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
41 ;; Retrieval Status Value (score). |
95610 | 42 |
43 ;; When looking at the retrieval result (in the Summary buffer) you | |
111669
ed117caa918e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111584
diff
changeset
|
44 ;; can type `A W' (aka M-x gnus-warp-to-article RET) on an article. You |
111430
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
45 ;; will be warped into the group this article came from. Typing `A W' |
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
46 ;; (aka M-x gnus-summary-refer-thread RET) will warp to the group and |
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
47 ;; also show the thread this article is part of. |
95610 | 48 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
49 ;; The Lisp setup may involve setting a few variables and setting up the |
95610 | 50 ;; search engine. You can define the variables in the server definition |
51 ;; like this : | |
52 ;; (setq gnus-secondary-select-methods '( | |
53 ;; (nnimap "" (nnimap-address "localhost") | |
111217
7be484934a7c
nnir.el (nnir-run-swish-e): Remove hyrex support.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111138
diff
changeset
|
54 ;; (nnir-search-engine namazu) |
95610 | 55 ;; ))) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
56 ;; The main variable to set is `nnir-search-engine'. Choose one of |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
57 ;; the engines listed in `nnir-engines'. (Actually `nnir-engines' is |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
58 ;; an alist, type `C-h v nnir-engines RET' for more information; this |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
59 ;; includes examples for setting `nnir-search-engine', too.) |
95610 | 60 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
61 ;; If you use one of the local indices (namazu, find-grep, swish) you |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
62 ;; must also set up a search engine backend. |
95610 | 63 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
64 ;; 1. Namazu |
95610 | 65 ;; |
66 ;; The Namazu backend requires you to have one directory containing all | |
67 ;; index files, this is controlled by the `nnir-namazu-index-directory' | |
68 ;; variable. To function the `nnir-namazu-remove-prefix' variable must | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
69 ;; also be correct, see the documentation for `nnir-namazu-remove-prefix' |
95610 | 70 ;; above. |
71 ;; | |
72 ;; It is particularly important not to pass any any switches to namazu | |
73 ;; that will change the output format. Good switches to use include | |
74 ;; `--sort', `--ascending', `--early' and `--late'. Refer to the Namazu | |
75 ;; documentation for further information on valid switches. | |
76 ;; | |
77 ;; To index my mail with the `mknmz' program I use the following | |
78 ;; configuration file: | |
79 ;; | |
80 ;; ,---- | |
81 ;; | package conf; # Don't remove this line! | |
82 ;; | | |
83 ;; | # Paths which will not be indexed. Don't use `^' or `$' anchors. | |
84 ;; | $EXCLUDE_PATH = "spam|sent"; | |
85 ;; | | |
86 ;; | # Header fields which should be searchable. case-insensitive | |
87 ;; | $REMAIN_HEADER = "from|date|message-id|subject"; | |
88 ;; | | |
89 ;; | # Searchable fields. case-insensitive | |
90 ;; | $SEARCH_FIELD = "from|date|message-id|subject"; | |
91 ;; | | |
92 ;; | # The max length of a word. | |
93 ;; | $WORD_LENG_MAX = 128; | |
94 ;; | | |
95 ;; | # The max length of a field. | |
96 ;; | $MAX_FIELD_LENGTH = 256; | |
97 ;; `---- | |
98 ;; | |
99 ;; My mail is stored in the directories ~/Mail/mail/, ~/Mail/lists/ and | |
100 ;; ~/Mail/archive/, so to index them I go to the directory set in | |
101 ;; `nnir-namazu-index-directory' and issue the following command. | |
102 ;; | |
103 ;; mknmz --mailnews ~/Mail/archive/ ~/Mail/mail/ ~/Mail/lists/ | |
104 ;; | |
105 ;; For maximum searching efficiency I have a cron job set to run this | |
106 ;; command every four hours. | |
107 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
108 ;; 2. find-grep |
95610 | 109 ;; |
110 ;; The find-grep engine simply runs find(1) to locate eligible | |
111 ;; articles and searches them with grep(1). This, of course, is much | |
112 ;; slower than using a proper search engine but OTOH doesn't require | |
113 ;; maintenance of an index and is still faster than using any built-in | |
114 ;; means for searching. The method specification of the server to | |
115 ;; search must include a directory for this engine to work (E.g., | |
116 ;; `nnml-directory'). The tools must be POSIX compliant. GNU Find | |
117 ;; prior to version 4.2.12 (4.2.26 on Linux due to incorrect ARG_MAX | |
118 ;; handling) does not work. | |
119 ;; ,---- | |
120 ;; | ;; find-grep configuration for searching the Gnus Cache | |
121 ;; | | |
122 ;; | (nnml "cache" | |
123 ;; | (nnml-get-new-mail nil) | |
124 ;; | (nnir-search-engine find-grep) | |
125 ;; | (nnml-directory "~/News/cache/") | |
126 ;; | (nnml-active-file "~/News/cache/active")) | |
127 ;; `---- | |
128 | |
129 ;; Developer information: | |
130 | |
131 ;; I have tried to make the code expandable. Basically, it is divided | |
132 ;; into two layers. The upper layer is somewhat like the `nnvirtual' | |
110100
8f51744211eb
Remove nndb, nnkiboze and related code.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
107978
diff
changeset
|
133 ;; backend: given a specification of what articles to show from |
8f51744211eb
Remove nndb, nnkiboze and related code.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
107978
diff
changeset
|
134 ;; another backend, it creates a group containing exactly those |
8f51744211eb
Remove nndb, nnkiboze and related code.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
107978
diff
changeset
|
135 ;; articles. The lower layer issues a query to a search engine and |
8f51744211eb
Remove nndb, nnkiboze and related code.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
107978
diff
changeset
|
136 ;; produces such a specification of what articles to show from the |
95610 | 137 ;; other backend. |
138 | |
139 ;; The interface between the two layers consists of the single | |
140 ;; function `nnir-run-query', which just selects the appropriate | |
141 ;; function for the search engine one is using. The input to | |
142 ;; `nnir-run-query' is a string, representing the query as input by | |
143 ;; the user. The output of `nnir-run-query' is supposed to be a | |
144 ;; vector, each element of which should in turn be a three-element | |
145 ;; vector. The first element should be full group name of the article, | |
146 ;; the second element should be the article number, and the third | |
147 ;; element should be the Retrieval Status Value (RSV) as returned from | |
148 ;; the search engine. An RSV is the score assigned to the document by | |
149 ;; the search engine. For Boolean search engines, the | |
150 ;; RSV is always 1000 (or 1 or 100, or whatever you like). | |
151 | |
152 ;; The sorting order of the articles in the summary buffer created by | |
153 ;; nnir is based on the order of the articles in the above mentioned | |
154 ;; vector, so that's where you can do the sorting you'd like. Maybe | |
155 ;; it would be nice to have a way of displaying the search result | |
156 ;; sorted differently? | |
157 | |
158 ;; So what do you need to do when you want to add another search | |
159 ;; engine? You write a function that executes the query. Temporary | |
160 ;; data from the search engine can be put in `nnir-tmp-buffer'. This | |
161 ;; function should return the list of articles as a vector, as | |
162 ;; described above. Then, you need to register this backend in | |
163 ;; `nnir-engines'. Then, users can choose the backend by setting | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
164 ;; `nnir-search-engine' as a server variable. |
95610 | 165 |
166 ;;; Setup Code: | |
167 | |
111288 | 168 ;; For Emacs <22.2 and XEmacs. |
169 (eval-and-compile | |
170 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) | |
171 | |
95610 | 172 (require 'nnoo) |
173 (require 'gnus-group) | |
174 (require 'gnus-sum) | |
175 (require 'message) | |
176 (require 'gnus-util) | |
104584
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
177 (eval-when-compile |
95610 | 178 (require 'cl)) |
179 | |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
180 |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
181 (eval-when-compile |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
182 (autoload 'nnimap-buffer "nnimap") |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
183 (autoload 'nnimap-command "nnimap") |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
184 (autoload 'nnimap-possibly-change-group "nnimap")) |
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
185 |
95610 | 186 (nnoo-declare nnir) |
187 (nnoo-define-basics nnir) | |
188 | |
189 (gnus-declare-backend "nnir" 'mail) | |
190 | |
191 | |
192 ;;; User Customizable Variables: | |
193 | |
194 (defgroup nnir nil | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
195 "Search groups in Gnus with assorted seach engines." |
95610 | 196 :group 'gnus) |
197 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
198 (defcustom nnir-method-default-engines |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
199 '((nnimap . imap) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
200 (nntp . gmane)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
201 "*Alist of default search engines keyed by server method" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
202 :type '(alist) |
95610 | 203 :group 'nnir) |
204 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
205 (defcustom nnir-imap-default-search-key "Whole message" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
206 "*The default IMAP search key for an nnir search. Must be one of |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
207 the keys in `nnir-imap-search-arguments'. To use raw imap queries |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
208 by default set this to \"Imap\"" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
209 :type '(string) |
95610 | 210 :group 'nnir) |
211 | |
212 (defcustom nnir-swish++-configuration-file | |
213 (expand-file-name "~/Mail/swish++.conf") | |
214 "*Configuration file for swish++." | |
215 :type '(file) | |
216 :group 'nnir) | |
217 | |
218 (defcustom nnir-swish++-program "search" | |
219 "*Name of swish++ search executable." | |
220 :type '(string) | |
221 :group 'nnir) | |
222 | |
223 (defcustom nnir-swish++-additional-switches '() | |
224 "*A list of strings, to be given as additional arguments to swish++. | |
225 | |
226 Note that this should be a list. Ie, do NOT use the following: | |
227 (setq nnir-swish++-additional-switches \"-i -w\") ; wrong | |
228 Instead, use this: | |
229 (setq nnir-swish++-additional-switches '(\"-i\" \"-w\"))" | |
230 :type '(repeat (string)) | |
231 :group 'nnir) | |
232 | |
233 (defcustom nnir-swish++-remove-prefix (concat (getenv "HOME") "/Mail/") | |
234 "*The prefix to remove from each file name returned by swish++ | |
235 in order to get a group name (albeit with / instead of .). This is a | |
236 regular expression. | |
237 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
238 This variable is very similar to `nnir-namazu-remove-prefix', except |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
239 that it is for swish++, not Namazu." |
95610 | 240 :type '(regexp) |
241 :group 'nnir) | |
242 | |
243 ;; Swish-E. | |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
244 ;; URL: http://swish-e.org/ |
95610 | 245 ;; Variables `nnir-swish-e-index-file', `nnir-swish-e-program' and |
246 ;; `nnir-swish-e-additional-switches' | |
247 | |
248 (make-obsolete-variable 'nnir-swish-e-index-file | |
104700
9866b069527c
* spam.el (spam-ifile-path, spam-bogofilter-path, spam-sa-learn-path)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
104584
diff
changeset
|
249 'nnir-swish-e-index-files "Emacs 23.1") |
95610 | 250 (defcustom nnir-swish-e-index-file |
251 (expand-file-name "~/Mail/index.swish-e") | |
252 "*Index file for swish-e. | |
253 This could be a server parameter. | |
254 It is never consulted once `nnir-swish-e-index-files', which should be | |
255 used instead, has been customized." | |
256 :type '(file) | |
257 :group 'nnir) | |
258 | |
259 (defcustom nnir-swish-e-index-files | |
260 (list nnir-swish-e-index-file) | |
261 "*List of index files for swish-e. | |
262 This could be a server parameter." | |
263 :type '(repeat (file)) | |
264 :group 'nnir) | |
265 | |
266 (defcustom nnir-swish-e-program "swish-e" | |
267 "*Name of swish-e search executable. | |
268 This cannot be a server parameter." | |
269 :type '(string) | |
270 :group 'nnir) | |
271 | |
272 (defcustom nnir-swish-e-additional-switches '() | |
273 "*A list of strings, to be given as additional arguments to swish-e. | |
274 | |
275 Note that this should be a list. Ie, do NOT use the following: | |
276 (setq nnir-swish-e-additional-switches \"-i -w\") ; wrong | |
277 Instead, use this: | |
278 (setq nnir-swish-e-additional-switches '(\"-i\" \"-w\")) | |
279 | |
280 This could be a server parameter." | |
281 :type '(repeat (string)) | |
282 :group 'nnir) | |
283 | |
284 (defcustom nnir-swish-e-remove-prefix (concat (getenv "HOME") "/Mail/") | |
285 "*The prefix to remove from each file name returned by swish-e | |
286 in order to get a group name (albeit with / instead of .). This is a | |
287 regular expression. | |
288 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
289 This variable is very similar to `nnir-namazu-remove-prefix', except |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
290 that it is for swish-e, not Namazu. |
95610 | 291 |
292 This could be a server parameter." | |
293 :type '(regexp) | |
294 :group 'nnir) | |
295 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
296 ;; HyREX engine, see <URL:http://ls6-www.cs.uni-dortmund.de/> |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
297 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
298 (defcustom nnir-hyrex-program "nnir-search" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
299 "*Name of the nnir-search executable." |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
300 :type '(string) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
301 :group 'nnir) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
302 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
303 (defcustom nnir-hyrex-additional-switches '() |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
304 "*A list of strings, to be given as additional arguments for nnir-search. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
305 Note that this should be a list. Ie, do NOT use the following: |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
306 (setq nnir-hyrex-additional-switches \"-ddl ddl.xml -c nnir\") ; wrong ! |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
307 Instead, use this: |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
308 (setq nnir-hyrex-additional-switches '(\"-ddl\" \"ddl.xml\" \"-c\" \"nnir\"))" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
309 :type '(repeat (string)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
310 :group 'nnir) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
311 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
312 (defcustom nnir-hyrex-index-directory (getenv "HOME") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
313 "*Index directory for HyREX." |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
314 :type '(directory) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
315 :group 'nnir) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
316 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
317 (defcustom nnir-hyrex-remove-prefix (concat (getenv "HOME") "/Mail/") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
318 "*The prefix to remove from each file name returned by HyREX |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
319 in order to get a group name (albeit with / instead of .). |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
320 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
321 For example, suppose that HyREX returns file names such as |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
322 \"/home/john/Mail/mail/misc/42\". For this example, use the following |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
323 setting: (setq nnir-hyrex-remove-prefix \"/home/john/Mail/\") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
324 Note the trailing slash. Removing this prefix gives \"mail/misc/42\". |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
325 `nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
326 arrive at the correct group name, \"mail.misc\"." |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
327 :type '(directory) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
328 :group 'nnir) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
329 |
110790
1f25b03df4ad
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110777
diff
changeset
|
330 ;; Namazu engine, see <URL:http://www.namazu.org/> |
95610 | 331 |
332 (defcustom nnir-namazu-program "namazu" | |
333 "*Name of Namazu search executable." | |
334 :type '(string) | |
335 :group 'nnir) | |
336 | |
337 (defcustom nnir-namazu-index-directory (expand-file-name "~/Mail/namazu/") | |
338 "*Index directory for Namazu." | |
339 :type '(directory) | |
340 :group 'nnir) | |
341 | |
342 (defcustom nnir-namazu-additional-switches '() | |
343 "*A list of strings, to be given as additional arguments to namazu. | |
344 The switches `-q', `-a', and `-s' are always used, very few other switches | |
345 make any sense in this context. | |
346 | |
347 Note that this should be a list. Ie, do NOT use the following: | |
348 (setq nnir-namazu-additional-switches \"-i -w\") ; wrong | |
349 Instead, use this: | |
350 (setq nnir-namazu-additional-switches '(\"-i\" \"-w\"))" | |
351 :type '(repeat (string)) | |
352 :group 'nnir) | |
353 | |
354 (defcustom nnir-namazu-remove-prefix (concat (getenv "HOME") "/Mail/") | |
355 "*The prefix to remove from each file name returned by Namazu | |
356 in order to get a group name (albeit with / instead of .). | |
357 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
358 For example, suppose that Namazu returns file names such as |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
359 \"/home/john/Mail/mail/misc/42\". For this example, use the following |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
360 setting: (setq nnir-namazu-remove-prefix \"/home/john/Mail/\") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
361 Note the trailing slash. Removing this prefix gives \"mail/misc/42\". |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
362 `nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
363 arrive at the correct group name, \"mail.misc\"." |
95610 | 364 :type '(directory) |
365 :group 'nnir) | |
366 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
367 ;; Imap variables |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
368 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
369 (defvar nnir-imap-search-arguments |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
370 '(("Whole message" . "TEXT") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
371 ("Subject" . "SUBJECT") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
372 ("To" . "TO") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
373 ("From" . "FROM") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
374 ("Imap" . "")) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
375 "Mapping from user readable keys to IMAP search items for use in nnir") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
376 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
377 (defvar nnir-imap-search-other "HEADER %S" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
378 "The IMAP search item to use for anything other than |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
379 `nnir-imap-search-arguments'. By default this is the name of an |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
380 email header field") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
381 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
382 (defvar nnir-imap-search-argument-history () |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
383 "The history for querying search options in nnir") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
384 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
385 ;;; Developer Extension Variable: |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
386 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
387 (defvar nnir-engines |
111321
f4305de1a430
nnir: remove wais support
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111314
diff
changeset
|
388 `((imap nnir-run-imap |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
389 ((criteria |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
390 "Imap Search in" ; Prompt |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
391 ,(mapcar 'car nnir-imap-search-arguments) ; alist for completing |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
392 nil ; allow any user input |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
393 nil ; initial value |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
394 nnir-imap-search-argument-history ; the history to use |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
395 ,nnir-imap-default-search-key ; default |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
396 ))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
397 (gmane nnir-run-gmane |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
398 ((author . "Gmane Author: "))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
399 (swish++ nnir-run-swish++ |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
400 ((group . "Swish++ Group spec: "))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
401 (swish-e nnir-run-swish-e |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
402 ((group . "Swish-e Group spec: "))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
403 (namazu nnir-run-namazu |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
404 ()) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
405 (hyrex nnir-run-hyrex |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
406 ((group . "Hyrex Group spec: "))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
407 (find-grep nnir-run-find-grep |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
408 ((grep-options . "Grep options: ")))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
409 "Alist of supported search engines. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
410 Each element in the alist is a three-element list (ENGINE FUNCTION ARGS). |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
411 ENGINE is a symbol designating the searching engine. FUNCTION is also |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
412 a symbol, giving the function that does the search. The third element |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
413 ARGS is a list of cons pairs (PARAM . PROMPT). When issuing a query, |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
414 the FUNCTION will issue a query for each of the PARAMs, using PROMPT. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
415 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
416 The value of `nnir-search-engine' must be one of the ENGINE symbols. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
417 For example, for searching a server using namazu include |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
418 (nnir-search-engine namazu) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
419 in the server definition. Note that you have to set additional |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
420 variables for most backends. For example, the `namazu' backend |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
421 needs the variables `nnir-namazu-program', |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
422 `nnir-namazu-index-directory' and `nnir-namazu-remove-prefix'. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
423 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
424 Add an entry here when adding a new search engine.") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
425 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
426 (defvar nnir-get-article-nov-override-function nil |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
427 "If non-nil, a function that will be passed each search result. This |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
428 should return a message's headers in NOV format. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
429 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
430 If this variable is nil, or if the provided function returns nil for a search |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
431 result, `gnus-retrieve-headers' will be called instead.") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
432 |
95610 | 433 ;;; Internal Variables: |
434 | |
435 (defvar nnir-current-query nil | |
436 "Internal: stores current query (= group name).") | |
437 | |
438 (defvar nnir-current-server nil | |
439 "Internal: stores current server (does it ever change?).") | |
440 | |
441 (defvar nnir-current-group-marked nil | |
442 "Internal: stores current list of process-marked groups.") | |
443 | |
444 (defvar nnir-artlist nil | |
445 "Internal: stores search result.") | |
446 | |
447 (defvar nnir-tmp-buffer " *nnir*" | |
448 "Internal: temporary buffer.") | |
449 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
450 (defvar nnir-search-history () |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
451 "Internal: the history for querying search options in nnir") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
452 |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
453 (defvar nnir-extra-parms nil |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
454 "Internal: stores request for extra search parms") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
455 |
95610 | 456 ;;; Code: |
457 | |
458 ;; Gnus glue. | |
459 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
460 (defun gnus-group-make-nnir-group (nnir-extra-parms) |
95610 | 461 "Create an nnir group. Asks for query." |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
462 (interactive "P") |
95610 | 463 (setq nnir-current-query nil |
464 nnir-current-server nil | |
465 nnir-current-group-marked nil | |
466 nnir-artlist nil) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
467 (let* ((query (read-string "Query: " nil 'nnir-search-history)) |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
468 (parms (list (cons 'query query))) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
469 (srv (if (gnus-server-server-name) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
470 "all" ""))) |
95610 | 471 (add-to-list 'parms (cons 'unique-id (message-unique-id)) t) |
472 (gnus-group-read-ephemeral-group | |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
473 (concat "nnir:" (prin1-to-string parms)) (list 'nnir srv) t |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
474 (cons (current-buffer) gnus-current-window-configuration) |
95610 | 475 nil))) |
476 | |
477 | |
478 ;; Gnus backend interface functions. | |
479 | |
480 (deffoo nnir-open-server (server &optional definitions) | |
481 ;; Just set the server variables appropriately. | |
482 (nnoo-change-server 'nnir server definitions)) | |
483 | |
110422
93e093c035a0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110410
diff
changeset
|
484 (deffoo nnir-request-group (group &optional server fast info) |
95610 | 485 "GROUP is the query string." |
486 (nnir-possibly-change-server server) | |
487 ;; Check for cache and return that if appropriate. | |
488 (if (and (equal group nnir-current-query) | |
489 (equal gnus-group-marked nnir-current-group-marked) | |
490 (or (null server) | |
491 (equal server nnir-current-server))) | |
492 nnir-artlist | |
493 ;; Cache miss. | |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
494 (setq nnir-artlist (nnir-run-query group server))) |
110410
f2e111723c3a
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110111
diff
changeset
|
495 (with-current-buffer nntp-server-buffer |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
496 (setq nnir-current-query group) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
497 (when server (setq nnir-current-server server)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
498 (setq nnir-current-group-marked gnus-group-marked) |
95610 | 499 (if (zerop (length nnir-artlist)) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
500 (nnheader-report 'nnir "Search produced empty results.") |
95610 | 501 ;; Remember data for cache. |
502 (nnheader-insert "211 %d %d %d %s\n" | |
503 (nnir-artlist-length nnir-artlist) ; total # | |
504 1 ; first # | |
505 (nnir-artlist-length nnir-artlist) ; last # | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
506 group)))) ; group name |
95610 | 507 |
508 (deffoo nnir-retrieve-headers (articles &optional group server fetch-old) | |
509 (save-excursion | |
510 (let ((artlist (copy-sequence articles)) | |
511 art artitem artgroup artno artrsv artfullgroup | |
512 novitem novdata foo server) | |
513 (while (not (null artlist)) | |
514 (setq art (car artlist)) | |
515 (or (numberp art) | |
516 (nnheader-report | |
517 'nnir | |
518 "nnir-retrieve-headers doesn't grok message ids: %s" | |
519 art)) | |
520 (setq artitem (nnir-artlist-article nnir-artlist art)) | |
521 (setq artrsv (nnir-artitem-rsv artitem)) | |
522 (setq artfullgroup (nnir-artitem-group artitem)) | |
523 (setq artno (nnir-artitem-number artitem)) | |
524 (setq artgroup (gnus-group-real-name artfullgroup)) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
525 (setq server (gnus-group-server artfullgroup)) |
95610 | 526 ;; retrieve NOV or HEAD data for this article, transform into |
527 ;; NOV data and prepend to `novdata' | |
528 (set-buffer nntp-server-buffer) | |
529 (nnir-possibly-change-server server) | |
530 (let ((gnus-override-method | |
531 (gnus-server-to-method server))) | |
107473 | 532 ;; if nnir-get-article-nov-override-function is set, use it |
533 (if nnir-get-article-nov-override-function | |
534 (setq novitem (funcall nnir-get-article-nov-override-function | |
535 artitem)) | |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
536 ;; else, set novitem through nnheader-parse-nov/nnheader-parse-head |
110111
5b9f64b04a04
Delete all trailing white space.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110102
diff
changeset
|
537 (case (setq foo (gnus-retrieve-headers (list artno) |
107473 | 538 artfullgroup nil)) |
539 (nov | |
540 (goto-char (point-min)) | |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
541 (setq novitem (nnheader-parse-nov))) |
107473 | 542 (headers |
543 (goto-char (point-min)) | |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
544 (setq novitem (nnheader-parse-head))) |
107473 | 545 (t (error "Unknown header type %s while requesting article %s of group %s" |
546 foo artno artfullgroup))))) | |
95610 | 547 ;; replace article number in original group with article number |
548 ;; in nnir group | |
110777
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
549 (when novitem |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
550 (mail-header-set-number novitem art) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
551 (mail-header-set-subject |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
552 novitem |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
553 (format "[%d: %s/%d] %s" |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
554 artrsv artgroup artno |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
555 (mail-header-subject novitem))) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
556 (push novitem novdata) |
895607aec71e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110763
diff
changeset
|
557 (setq artlist (cdr artlist)))) |
95610 | 558 (setq novdata (nreverse novdata)) |
559 (set-buffer nntp-server-buffer) (erase-buffer) | |
560 (mapc 'nnheader-insert-nov novdata) | |
561 'nov))) | |
562 | |
563 (deffoo nnir-request-article (article | |
564 &optional group server to-buffer) | |
565 (if (stringp article) | |
566 (nnheader-report | |
567 'nnir | |
568 "nnir-retrieve-headers doesn't grok message ids: %s" | |
569 article) | |
570 (save-excursion | |
571 (let* ((artitem (nnir-artlist-article nnir-artlist | |
572 article)) | |
573 (artfullgroup (nnir-artitem-group artitem)) | |
574 (artno (nnir-artitem-number artitem)) | |
575 ;; Bug? | |
576 ;; Why must we bind nntp-server-buffer here? It won't | |
577 ;; work if `buf' is used, say. (Of course, the set-buffer | |
578 ;; line below must then be updated, too.) | |
579 (nntp-server-buffer (or to-buffer nntp-server-buffer))) | |
580 (set-buffer nntp-server-buffer) | |
581 (erase-buffer) | |
582 (message "Requesting article %d from group %s" | |
583 artno artfullgroup) | |
584 (gnus-request-article artno artfullgroup nntp-server-buffer) | |
585 (cons artfullgroup artno))))) | |
586 | |
111324
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
587 (deffoo nnir-request-move-article (article group server accept-form |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
588 &optional last internal-move-group) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
589 (let* ((artitem (nnir-artlist-article nnir-artlist |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
590 article)) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
591 (artfullgroup (nnir-artitem-group artitem)) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
592 (artno (nnir-artitem-number artitem)) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
593 (to-newsgroup (nth 1 accept-form)) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
594 (to-method (gnus-find-method-for-group to-newsgroup)) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
595 (from-method (gnus-find-method-for-group artfullgroup)) |
111482
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
596 (move-is-internal (gnus-server-equal from-method to-method)) |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
597 (artsubject (mail-header-subject |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
598 (gnus-data-header |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
599 (assoc article (gnus-data-list nil)))))) |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
600 (setq gnus-newsgroup-original-name artfullgroup) |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
601 (string-match "^\\[[0-9]+:.+/[0-9]+\\] " artsubject) |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
602 (setq gnus-article-original-subject (substring artsubject (match-end 0))) |
111324
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
603 (gnus-request-move-article |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
604 artno |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
605 artfullgroup |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
606 (nth 1 from-method) |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
607 accept-form |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
608 last |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
609 (and move-is-internal |
ab83881bb97a
nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111321
diff
changeset
|
610 to-newsgroup ; Not respooling |
111482
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
611 (gnus-group-real-name to-newsgroup))))) |
95610 | 612 |
111430
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
613 (deffoo nnir-warp-to-article () |
111482
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
614 (let* ((cur (if (> (gnus-summary-article-number) 0) |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
615 (gnus-summary-article-number) |
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
616 (error "This is not a real article."))) |
111430
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
617 (gnus-newsgroup-name (nnir-artlist-artitem-group nnir-artlist cur)) |
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
618 (backend-number (nnir-artlist-artitem-number nnir-artlist cur))) |
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
619 (gnus-summary-read-group-1 gnus-newsgroup-name t t gnus-summary-buffer |
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
620 nil (list backend-number)))) |
b75e6634a171
gnus-int.el, nnimap.el, nnir.el: More improvements to thread-referral.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111401
diff
changeset
|
621 |
95610 | 622 (nnoo-define-skeleton nnir) |
623 | |
624 | |
625 (defmacro nnir-add-result (dirnam artno score prefix server artlist) | |
95616 | 626 "Ask `nnir-compose-result' to construct a result vector, |
95610 | 627 and if it is non-nil, add it to artlist." |
628 `(let ((result (nnir-compose-result ,dirnam ,artno ,score ,prefix ,server))) | |
629 (when (not (null result)) | |
630 (push result ,artlist)))) | |
631 | |
632 (autoload 'nnmaildir-base-name-to-article-number "nnmaildir") | |
633 | |
634 ;; Helper function currently used by the Swish++ and Namazu backends; | |
635 ;; perhaps useful for other backends as well | |
636 (defun nnir-compose-result (dirnam article score prefix server) | |
637 "Extract the group from dirnam, and create a result vector | |
638 ready to be added to the list of search results." | |
639 | |
640 ;; remove nnir-*-remove-prefix from beginning of dirnam filename | |
641 (when (string-match (concat "^" prefix) dirnam) | |
642 (setq dirnam (replace-match "" t t dirnam))) | |
643 | |
644 (when (file-readable-p (concat prefix dirnam article)) | |
645 ;; remove trailing slash and, for nnmaildir, cur/new/tmp | |
646 (setq dirnam | |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
647 (substring dirnam 0 |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
648 (if (string= (gnus-group-server server) "nnmaildir") |
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
649 -5 -1))) |
95610 | 650 |
651 ;; Set group to dirnam without any leading dots or slashes, | |
652 ;; and with all subsequent slashes replaced by dots | |
653 (let ((group (gnus-replace-in-string | |
654 (gnus-replace-in-string dirnam "^[./\\]" "" t) | |
655 "[/\\]" "." t))) | |
656 | |
657 (vector (nnir-group-full-name group server) | |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
658 (if (string= (gnus-group-server server) "nnmaildir") |
95610 | 659 (nnmaildir-base-name-to-article-number |
660 (substring article 0 (string-match ":" article)) | |
661 group nil) | |
662 (string-to-number article)) | |
663 (string-to-number score))))) | |
664 | |
665 ;;; Search Engine Interfaces: | |
666 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
667 ;; imap interface |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
668 (defun nnir-run-imap (query srv &optional groups) |
95610 | 669 "Run a search against an IMAP back-end server. |
670 This uses a custom query language parser; see `nnir-imap-make-query' for | |
671 details on the language and supported extensions" | |
672 (save-excursion | |
673 (let ((qstring (cdr (assq 'query query))) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
674 (server (cadr (gnus-server-to-method srv))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
675 (defs (caddr (gnus-server-to-method srv))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
676 (criteria (or (cdr (assq 'criteria query)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
677 (cdr (assoc nnir-imap-default-search-key |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
678 nnir-imap-search-arguments)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
679 (gnus-inhibit-demon t) |
111584
4273d2312244
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111491
diff
changeset
|
680 (groups (or groups (nnir-get-active srv)))) |
95610 | 681 (message "Opening server %s" server) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
682 (apply |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
683 'vconcat |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
684 (mapcar |
111669
ed117caa918e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111584
diff
changeset
|
685 (lambda (group) |
ed117caa918e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111584
diff
changeset
|
686 (let (artlist) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
687 (condition-case () |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
688 (when (nnimap-possibly-change-group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
689 (gnus-group-short-name group) server) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
690 (with-current-buffer (nnimap-buffer) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
691 (message "Searching %s..." group) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
692 (let ((arts 0) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
693 (result (nnimap-command "UID SEARCH %s" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
694 (if (string= criteria "") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
695 qstring |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
696 (nnir-imap-make-query |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
697 criteria qstring))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
698 (mapc |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
699 (lambda (artnum) (push (vector group artnum 1) artlist) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
700 (setq arts (1+ arts))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
701 (and (car result) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
702 (delete 0 (mapcar #'string-to-number |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
703 (cdr (assoc "SEARCH" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
704 (cdr result))))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
705 (message "Searching %s... %d matches" group arts))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
706 (message "Searching %s...done" group)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
707 (quit nil)) |
111669
ed117caa918e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111584
diff
changeset
|
708 artlist)) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
709 groups))))) |
95610 | 710 |
711 (defun nnir-imap-make-query (criteria qstring) | |
712 "Parse the query string and criteria into an appropriate IMAP search | |
713 expression, returning the string query to make. | |
714 | |
715 This implements a little language designed to return the expected results | |
716 to an arbitrary query string to the end user. | |
717 | |
718 The search is always case-insensitive, as defined by RFC2060, and supports | |
95616 | 719 the following features (inspired by the Google search input language): |
95610 | 720 |
721 Automatic \"and\" queries | |
722 If you specify multiple words then they will be treated as an \"and\" | |
723 expression intended to match all components. | |
724 | |
725 Phrase searches | |
726 If you wrap your query in double-quotes then it will be treated as a | |
727 literal string. | |
728 | |
729 Negative terms | |
730 If you precede a term with \"-\" then it will negate that. | |
731 | |
732 \"OR\" queries | |
733 If you include an upper-case \"OR\" in your search it will cause the | |
734 term before it and the term after it to be treated as alternatives. | |
735 | |
736 In future the following will be added to the language: | |
737 * support for date matches | |
738 * support for location of text matching within the query | |
739 * from/to/etc headers | |
740 * additional search terms | |
741 * flag based searching | |
742 * anything else that the RFC supports, basically." | |
743 ;; Walk through the query and turn it into an IMAP query string. | |
744 (nnir-imap-query-to-imap criteria (nnir-imap-parse-query qstring))) | |
745 | |
746 | |
747 (defun nnir-imap-query-to-imap (criteria query) | |
748 "Turn a s-expression format query into IMAP." | |
749 (mapconcat | |
750 ;; Turn the expressions into IMAP text | |
751 (lambda (item) | |
752 (nnir-imap-expr-to-imap criteria item)) | |
753 ;; The query, already in s-expr format. | |
754 query | |
755 ;; Append a space between each expression | |
756 " ")) | |
757 | |
758 | |
759 (defun nnir-imap-expr-to-imap (criteria expr) | |
760 "Convert EXPR into an IMAP search expression on CRITERIA" | |
761 ;; What sort of expression is this, eh? | |
762 (cond | |
763 ;; Simple string term | |
764 ((stringp expr) | |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
765 (format "%s %S" criteria expr)) |
95610 | 766 ;; Trivial term: and |
767 ((eq expr 'and) nil) | |
768 ;; Composite term: or expression | |
769 ((eq (car-safe expr) 'or) | |
770 (format "OR %s %s" | |
771 (nnir-imap-expr-to-imap criteria (second expr)) | |
772 (nnir-imap-expr-to-imap criteria (third expr)))) | |
773 ;; Composite term: just the fax, mam | |
774 ((eq (car-safe expr) 'not) | |
775 (format "NOT (%s)" (nnir-imap-query-to-imap criteria (rest expr)))) | |
776 ;; Composite term: just expand it all. | |
777 ((and (not (null expr)) (listp expr)) | |
778 (format "(%s)" (nnir-imap-query-to-imap criteria expr))) | |
779 ;; Complex value, give up for now. | |
780 (t (error "Unhandled input: %S" expr)))) | |
781 | |
782 | |
783 (defun nnir-imap-parse-query (string) | |
784 "Turn STRING into an s-expression based query based on the IMAP | |
785 query language as defined in `nnir-imap-make-query'. | |
786 | |
787 This involves turning individual tokens into higher level terms | |
788 that the search language can then understand and use." | |
789 (with-temp-buffer | |
790 ;; Set up the parsing environment. | |
791 (insert string) | |
792 (goto-char (point-min)) | |
793 ;; Now, collect the output terms and return them. | |
794 (let (out) | |
795 (while (not (nnir-imap-end-of-input)) | |
796 (push (nnir-imap-next-expr) out)) | |
797 (reverse out)))) | |
798 | |
799 | |
800 (defun nnir-imap-next-expr (&optional count) | |
801 "Return the next expression from the current buffer." | |
802 (let ((term (nnir-imap-next-term count)) | |
803 (next (nnir-imap-peek-symbol))) | |
804 ;; Are we looking at an 'or' expression? | |
805 (cond | |
806 ;; Handle 'expr or expr' | |
807 ((eq next 'or) | |
808 (list 'or term (nnir-imap-next-expr 2))) | |
809 ;; Anything else | |
810 (t term)))) | |
811 | |
812 | |
813 (defun nnir-imap-next-term (&optional count) | |
814 "Return the next TERM from the current buffer." | |
815 (let ((term (nnir-imap-next-symbol count))) | |
816 ;; What sort of term is this? | |
817 (cond | |
818 ;; and -- just ignore it | |
819 ((eq term 'and) 'and) | |
820 ;; negated term | |
821 ((eq term 'not) (list 'not (nnir-imap-next-expr))) | |
822 ;; generic term | |
823 (t term)))) | |
824 | |
825 | |
826 (defun nnir-imap-peek-symbol () | |
827 "Return the next symbol from the current buffer, but don't consume it." | |
828 (save-excursion | |
829 (nnir-imap-next-symbol))) | |
830 | |
831 (defun nnir-imap-next-symbol (&optional count) | |
832 "Return the next symbol from the current buffer, or nil if we are | |
833 at the end of the buffer. If supplied COUNT skips some symbols before | |
834 returning the one at the supplied position." | |
835 (when (and (numberp count) (> count 1)) | |
836 (nnir-imap-next-symbol (1- count))) | |
837 (let ((case-fold-search t)) | |
838 ;; end of input stream? | |
839 (unless (nnir-imap-end-of-input) | |
840 ;; No, return the next symbol from the stream. | |
841 (cond | |
842 ;; negated expression -- return it and advance one char. | |
843 ((looking-at "-") (forward-char 1) 'not) | |
844 ;; quoted string | |
845 ((looking-at "\"") (nnir-imap-delimited-string "\"")) | |
846 ;; list expression -- we parse the content and return this as a list. | |
847 ((looking-at "(") | |
848 (nnir-imap-parse-query (nnir-imap-delimited-string ")"))) | |
849 ;; keyword input -- return a symbol version | |
850 ((looking-at "\\band\\b") (forward-char 3) 'and) | |
851 ((looking-at "\\bor\\b") (forward-char 2) 'or) | |
852 ((looking-at "\\bnot\\b") (forward-char 3) 'not) | |
853 ;; Simple, boring keyword | |
854 (t (let ((start (point)) | |
855 (end (if (search-forward-regexp "[[:blank:]]" nil t) | |
856 (prog1 | |
857 (match-beginning 0) | |
858 ;; unskip if we hit a non-blank terminal character. | |
859 (when (string-match "[^[:blank:]]" (match-string 0)) | |
860 (backward-char 1))) | |
861 (goto-char (point-max))))) | |
862 (buffer-substring start end))))))) | |
863 | |
864 (defun nnir-imap-delimited-string (delimiter) | |
865 "Return a delimited string from the current buffer." | |
866 (let ((start (point)) end) | |
867 (forward-char 1) ; skip the first delimiter. | |
868 (while (not end) | |
869 (unless (search-forward delimiter nil t) | |
870 (error "Unmatched delimited input with %s in query" delimiter)) | |
871 (let ((here (point))) | |
872 (unless (equal (buffer-substring (- here 2) (- here 1)) "\\") | |
873 (setq end (point))))) | |
874 (buffer-substring (1+ start) (1- end)))) | |
875 | |
876 (defun nnir-imap-end-of-input () | |
877 "Are we at the end of input?" | |
878 (skip-chars-forward "[[:blank:]]") | |
879 (looking-at "$")) | |
95616 | 880 |
95610 | 881 |
882 ;; Swish++ interface. | |
883 ;; -cc- Todo | |
884 ;; Search by | |
885 ;; - group | |
886 ;; Sort by | |
887 ;; - rank (default) | |
888 ;; - article number | |
889 ;; - file size | |
890 ;; - group | |
891 (defun nnir-run-swish++ (query server &optional group) | |
892 "Run QUERY against swish++. | |
893 Returns a vector of (group name, file name) pairs (also vectors, | |
894 actually). | |
895 | |
896 Tested with swish++ 4.7 on GNU/Linux and with swish++ 5.0b2 on | |
897 Windows NT 4.0." | |
898 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
899 ;; (when group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
900 ;; (error "The swish++ backend cannot search specific groups")) |
95610 | 901 |
902 (save-excursion | |
903 (let ( (qstring (cdr (assq 'query query))) | |
904 (groupspec (cdr (assq 'group query))) | |
905 (prefix (nnir-read-server-parm 'nnir-swish++-remove-prefix server)) | |
906 artlist | |
907 ;; nnml-use-compressed-files might be any string, but probably this | |
908 ;; is sufficient. Note that we can't only use the value of | |
909 ;; nnml-use-compressed-files because old articles might have been | |
910 ;; saved with a different value. | |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
911 (article-pattern (if (string= (gnus-group-server server) "nnmaildir") |
95610 | 912 ":[0-9]+" |
913 "^[0-9]+\\(\\.[a-z0-9]+\\)?$")) | |
914 score artno dirnam filenam) | |
915 | |
916 (when (equal "" qstring) | |
105167
e14dfafc8256
* gnus-art.el (gnus-article-encrypt-body):
Juanma Barranquero <lekktu@gmail.com>
parents:
104700
diff
changeset
|
917 (error "swish++: You didn't enter anything")) |
95610 | 918 |
919 (set-buffer (get-buffer-create nnir-tmp-buffer)) | |
920 (erase-buffer) | |
921 | |
922 (if groupspec | |
923 (message "Doing swish++ query %s on %s..." qstring groupspec) | |
924 (message "Doing swish++ query %s..." qstring)) | |
925 | |
926 (let* ((cp-list `( ,nnir-swish++-program | |
927 nil ; input from /dev/null | |
928 t ; output | |
929 nil ; don't redisplay | |
930 "--config-file" ,(nnir-read-server-parm 'nnir-swish++-configuration-file server) | |
931 ,@(nnir-read-server-parm 'nnir-swish++-additional-switches server) | |
932 ,qstring ; the query, in swish++ format | |
933 )) | |
934 (exitstatus | |
935 (progn | |
936 (message "%s args: %s" nnir-swish++-program | |
937 (mapconcat 'identity (cddddr cp-list) " ")) ;; ??? | |
938 (apply 'call-process cp-list)))) | |
939 (unless (or (null exitstatus) | |
940 (zerop exitstatus)) | |
941 (nnheader-report 'nnir "Couldn't run swish++: %s" exitstatus) | |
942 ;; swish++ failure reason is in this buffer, show it if | |
943 ;; the user wants it. | |
944 (when (> gnus-verbose 6) | |
945 (display-buffer nnir-tmp-buffer)))) | |
946 | |
947 ;; The results are output in the format of: | |
948 ;; V 4.7 Linux | |
949 ;; rank relative-path-name file-size file-title | |
950 ;; V 5.0b2: | |
951 ;; rank relative-path-name file-size topic?? | |
952 ;; where rank is an integer from 1 to 100. | |
953 (goto-char (point-min)) | |
954 (while (re-search-forward | |
955 "\\(^[0-9]+\\) \\([^ ]+\\) [0-9]+ \\(.*\\)$" nil t) | |
956 (setq score (match-string 1) | |
957 filenam (match-string 2) | |
958 artno (file-name-nondirectory filenam) | |
959 dirnam (file-name-directory filenam)) | |
960 | |
961 ;; don't match directories | |
962 (when (string-match article-pattern artno) | |
963 (when (not (null dirnam)) | |
964 | |
965 ;; maybe limit results to matching groups. | |
966 (when (or (not groupspec) | |
967 (string-match groupspec dirnam)) | |
968 (nnir-add-result dirnam artno score prefix server artlist))))) | |
969 | |
970 (message "Massaging swish++ output...done") | |
971 | |
972 ;; Sort by score | |
973 (apply 'vector | |
104584
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
974 (sort artlist |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
975 (function (lambda (x y) |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
976 (> (nnir-artitem-rsv x) |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
977 (nnir-artitem-rsv y))))))))) |
95610 | 978 |
979 ;; Swish-E interface. | |
980 (defun nnir-run-swish-e (query server &optional group) | |
981 "Run given query against swish-e. | |
982 Returns a vector of (group name, file name) pairs (also vectors, | |
983 actually). | |
984 | |
985 Tested with swish-e-2.0.1 on Windows NT 4.0." | |
986 | |
987 ;; swish-e crashes with empty parameter to "-w" on commandline... | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
988 ;; (when group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
989 ;; (error "The swish-e backend cannot search specific groups")) |
95610 | 990 |
991 (save-excursion | |
992 (let ((qstring (cdr (assq 'query query))) | |
993 (prefix | |
994 (or (nnir-read-server-parm 'nnir-swish-e-remove-prefix server) | |
995 (error "Missing parameter `nnir-swish-e-remove-prefix'"))) | |
996 artlist score artno dirnam group ) | |
997 | |
998 (when (equal "" qstring) | |
105167
e14dfafc8256
* gnus-art.el (gnus-article-encrypt-body):
Juanma Barranquero <lekktu@gmail.com>
parents:
104700
diff
changeset
|
999 (error "swish-e: You didn't enter anything")) |
95610 | 1000 |
1001 (set-buffer (get-buffer-create nnir-tmp-buffer)) | |
1002 (erase-buffer) | |
1003 | |
1004 (message "Doing swish-e query %s..." query) | |
1005 (let* ((index-files | |
1006 (or (nnir-read-server-parm | |
1007 'nnir-swish-e-index-files server) | |
1008 (error "Missing parameter `nnir-swish-e-index-files'"))) | |
1009 (additional-switches | |
1010 (nnir-read-server-parm | |
1011 'nnir-swish-e-additional-switches server)) | |
1012 (cp-list `(,nnir-swish-e-program | |
1013 nil ; input from /dev/null | |
1014 t ; output | |
1015 nil ; don't redisplay | |
1016 "-f" ,@index-files | |
1017 ,@additional-switches | |
1018 "-w" | |
1019 ,qstring ; the query, in swish-e format | |
1020 )) | |
1021 (exitstatus | |
1022 (progn | |
1023 (message "%s args: %s" nnir-swish-e-program | |
1024 (mapconcat 'identity (cddddr cp-list) " ")) | |
1025 (apply 'call-process cp-list)))) | |
1026 (unless (or (null exitstatus) | |
1027 (zerop exitstatus)) | |
1028 (nnheader-report 'nnir "Couldn't run swish-e: %s" exitstatus) | |
1029 ;; swish-e failure reason is in this buffer, show it if | |
1030 ;; the user wants it. | |
1031 (when (> gnus-verbose 6) | |
1032 (display-buffer nnir-tmp-buffer)))) | |
1033 | |
1034 ;; The results are output in the format of: | |
1035 ;; rank path-name file-title file-size | |
1036 (goto-char (point-min)) | |
1037 (while (re-search-forward | |
1038 "\\(^[0-9]+\\) \\([^ ]+\\) \"\\([^\"]+\\)\" [0-9]+$" nil t) | |
1039 (setq score (match-string 1) | |
1040 artno (match-string 3) | |
1041 dirnam (file-name-directory (match-string 2))) | |
1042 | |
1043 ;; don't match directories | |
1044 (when (string-match "^[0-9]+$" artno) | |
1045 (when (not (null dirnam)) | |
1046 | |
1047 ;; remove nnir-swish-e-remove-prefix from beginning of dirname | |
1048 (when (string-match (concat "^" prefix) dirnam) | |
1049 (setq dirnam (replace-match "" t t dirnam))) | |
1050 | |
1051 (setq dirnam (substring dirnam 0 -1)) | |
1052 ;; eliminate all ".", "/", "\" from beginning. Always matches. | |
1053 (string-match "^[./\\]*\\(.*\\)$" dirnam) | |
1054 ;; "/" -> "." | |
104584
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1055 (setq group (gnus-replace-in-string (match-string 1 dirnam) "/" ".")) |
95610 | 1056 ;; Windows "\\" -> "." |
104584
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1057 (setq group (gnus-replace-in-string group "\\\\" ".")) |
95610 | 1058 |
1059 (push (vector (nnir-group-full-name group server) | |
1060 (string-to-number artno) | |
1061 (string-to-number score)) | |
1062 artlist)))) | |
1063 | |
1064 (message "Massaging swish-e output...done") | |
1065 | |
1066 ;; Sort by score | |
1067 (apply 'vector | |
104584
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1068 (sort artlist |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1069 (function (lambda (x y) |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1070 (> (nnir-artitem-rsv x) |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1071 (nnir-artitem-rsv y))))))))) |
95610 | 1072 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1073 ;; HyREX interface |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1074 (defun nnir-run-hyrex (query server &optional group) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1075 (save-excursion |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1076 (let ((artlist nil) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1077 (groupspec (cdr (assq 'group query))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1078 (qstring (cdr (assq 'query query))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1079 (prefix (nnir-read-server-parm 'nnir-hyrex-remove-prefix server)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1080 score artno dirnam) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1081 (when (and (not groupspec) group) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1082 (setq groupspec |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1083 (regexp-opt |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1084 (mapcar (lambda (x) (gnus-group-real-name x)) group)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1085 (set-buffer (get-buffer-create nnir-tmp-buffer)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1086 (erase-buffer) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1087 (message "Doing hyrex-search query %s..." query) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1088 (let* ((cp-list |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1089 `( ,nnir-hyrex-program |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1090 nil ; input from /dev/null |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1091 t ; output |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1092 nil ; don't redisplay |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1093 "-i",(nnir-read-server-parm 'nnir-hyrex-index-directory server) ; index directory |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1094 ,@(nnir-read-server-parm 'nnir-hyrex-additional-switches server) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1095 ,qstring ; the query, in hyrex-search format |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1096 )) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1097 (exitstatus |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1098 (progn |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1099 (message "%s args: %s" nnir-hyrex-program |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1100 (mapconcat 'identity (cddddr cp-list) " ")) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1101 (apply 'call-process cp-list)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1102 (unless (or (null exitstatus) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1103 (zerop exitstatus)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1104 (nnheader-report 'nnir "Couldn't run hyrex-search: %s" exitstatus) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1105 ;; nnir-search failure reason is in this buffer, show it if |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1106 ;; the user wants it. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1107 (when (> gnus-verbose 6) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1108 (display-buffer nnir-tmp-buffer)))) ;; FIXME: Dont clear buffer ! |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1109 (message "Doing hyrex-search query \"%s\"...done" qstring) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1110 (sit-for 0) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1111 ;; nnir-search returns: |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1112 ;; for nnml/nnfolder: "filename mailid weigth" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1113 ;; for nnimap: "group mailid weigth" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1114 (goto-char (point-min)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1115 (delete-non-matching-lines "^\\S + [0-9]+ [0-9]+$") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1116 ;; HyREX doesn't search directly in groups -- so filter out here. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1117 (when groupspec |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1118 (keep-lines groupspec)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1119 ;; extract data from result lines |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1120 (goto-char (point-min)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1121 (while (re-search-forward |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1122 "\\(\\S +\\) \\([0-9]+\\) \\([0-9]+\\)" nil t) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1123 (setq dirnam (match-string 1) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1124 artno (match-string 2) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1125 score (match-string 3)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1126 (when (string-match prefix dirnam) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1127 (setq dirnam (replace-match "" t t dirnam))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1128 (push (vector (nnir-group-full-name |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1129 (gnus-replace-in-string dirnam "/" ".") server) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1130 (string-to-number artno) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1131 (string-to-number score)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1132 artlist)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1133 (message "Massaging hyrex-search output...done.") |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1134 (apply 'vector |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1135 (sort artlist |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1136 (function (lambda (x y) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1137 (if (string-lessp (nnir-artitem-group x) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1138 (nnir-artitem-group y)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1139 t |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1140 (< (nnir-artitem-number x) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1141 (nnir-artitem-number y))))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1142 ))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1143 |
95610 | 1144 ;; Namazu interface |
1145 (defun nnir-run-namazu (query server &optional group) | |
1146 "Run given query against Namazu. Returns a vector of (group name, file name) | |
1147 pairs (also vectors, actually). | |
1148 | |
1149 Tested with Namazu 2.0.6 on a GNU/Linux system." | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1150 ;; (when group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1151 ;; (error "The Namazu backend cannot search specific groups")) |
95610 | 1152 (save-excursion |
110666
3b9bd3888ee9
nnimap.el (nnimap-request-accept-article): Get the Message-ID without the \r.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110661
diff
changeset
|
1153 (let ((article-pattern (if (string= (gnus-group-server server) "nnmaildir") |
95610 | 1154 ":[0-9]+" |
1155 "^[0-9]+$")) | |
1156 artlist | |
1157 (qstring (cdr (assq 'query query))) | |
1158 (prefix (nnir-read-server-parm 'nnir-namazu-remove-prefix server)) | |
1159 score group article | |
1160 (process-environment (copy-sequence process-environment))) | |
1161 (setenv "LC_MESSAGES" "C") | |
1162 (set-buffer (get-buffer-create nnir-tmp-buffer)) | |
1163 (erase-buffer) | |
1164 (let* ((cp-list | |
1165 `( ,nnir-namazu-program | |
1166 nil ; input from /dev/null | |
1167 t ; output | |
1168 nil ; don't redisplay | |
1169 "-q" ; don't be verbose | |
1170 "-a" ; show all matches | |
1171 "-s" ; use short format | |
1172 ,@(nnir-read-server-parm 'nnir-namazu-additional-switches server) | |
1173 ,qstring ; the query, in namazu format | |
1174 ,(nnir-read-server-parm 'nnir-namazu-index-directory server) ; index directory | |
1175 )) | |
1176 (exitstatus | |
1177 (progn | |
1178 (message "%s args: %s" nnir-namazu-program | |
1179 (mapconcat 'identity (cddddr cp-list) " ")) | |
1180 (apply 'call-process cp-list)))) | |
1181 (unless (or (null exitstatus) | |
1182 (zerop exitstatus)) | |
1183 (nnheader-report 'nnir "Couldn't run namazu: %s" exitstatus) | |
1184 ;; Namazu failure reason is in this buffer, show it if | |
1185 ;; the user wants it. | |
1186 (when (> gnus-verbose 6) | |
1187 (display-buffer nnir-tmp-buffer)))) | |
1188 | |
1189 ;; Namazu output looks something like this: | |
1190 ;; 2. Re: Gnus agent expire broken (score: 55) | |
1191 ;; /home/henrik/Mail/mail/sent/1310 (4,138 bytes) | |
1192 | |
1193 (goto-char (point-min)) | |
1194 (while (re-search-forward | |
1195 "^\\([0-9]+\\.\\).*\\((score: \\([0-9]+\\)\\))\n\\([^ ]+\\)" | |
1196 nil t) | |
1197 (setq score (match-string 3) | |
1198 group (file-name-directory (match-string 4)) | |
1199 article (file-name-nondirectory (match-string 4))) | |
1200 | |
1201 ;; make sure article and group is sane | |
1202 (when (and (string-match article-pattern article) | |
1203 (not (null group))) | |
1204 (nnir-add-result group article score prefix server artlist))) | |
1205 | |
1206 ;; sort artlist by score | |
1207 (apply 'vector | |
104584
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1208 (sort artlist |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1209 (function (lambda (x y) |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1210 (> (nnir-artitem-rsv x) |
f540e84a920d
(top-level): Don't require cl at run-time.
Glenn Morris <rgm@gnu.org>
parents:
100908
diff
changeset
|
1211 (nnir-artitem-rsv y))))))))) |
95610 | 1212 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1213 (defun nnir-run-find-grep (query server &optional grouplist) |
95610 | 1214 "Run find and grep to obtain matching articles." |
1215 (let* ((method (gnus-server-to-method server)) | |
1216 (sym (intern | |
1217 (concat (symbol-name (car method)) "-directory"))) | |
1218 (directory (cadr (assoc sym (cddr method)))) | |
1219 (regexp (cdr (assoc 'query query))) | |
1220 (grep-options (cdr (assoc 'grep-options query))) | |
1221 artlist) | |
1222 (unless directory | |
1223 (error "No directory found in method specification of server %s" | |
1224 server)) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1225 (apply |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1226 'vconcat |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1227 (mapcar (lambda (x) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1228 (let ((group x)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1229 (message "Searching %s using find-grep..." |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1230 (or group server)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1231 (save-window-excursion |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1232 (set-buffer (get-buffer-create nnir-tmp-buffer)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1233 (erase-buffer) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1234 (if (> gnus-verbose 6) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1235 (pop-to-buffer (current-buffer))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1236 (cd directory) ; Using relative paths simplifies |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1237 ; postprocessing. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1238 (let ((group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1239 (if (not group) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1240 "." |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1241 ;; Try accessing the group literally as |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1242 ;; well as interpreting dots as directory |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1243 ;; separators so the engine works with |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1244 ;; plain nnml as well as the Gnus Cache. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1245 (let ((group (gnus-group-real-name group))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1246 ;; Replace cl-func find-if. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1247 (if (file-directory-p group) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1248 group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1249 (if (file-directory-p |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1250 (setq group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1251 (gnus-replace-in-string |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1252 group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1253 "\\." "/" t))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1254 group)))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1255 (unless group |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1256 (error "Cannot locate directory for group")) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1257 (save-excursion |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1258 (apply |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1259 'call-process "find" nil t |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1260 "find" group "-type" "f" "-name" "[0-9]*" "-exec" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1261 "grep" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1262 `("-l" ,@(and grep-options |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1263 (split-string grep-options "\\s-" t)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1264 "-e" ,regexp "{}" "+")))) |
95610 | 1265 |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1266 ;; Translate relative paths to group names. |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1267 (while (not (eobp)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1268 (let* ((path (split-string |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1269 (buffer-substring |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1270 (point) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1271 (line-end-position)) "/" t)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1272 (art (string-to-number (car (last path))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1273 (while (string= "." (car path)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1274 (setq path (cdr path))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1275 (let ((group (mapconcat 'identity |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1276 ;; Replace cl-func: |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1277 ;; (subseq path 0 -1) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1278 (let ((end (1- (length path))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1279 res) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1280 (while |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1281 (>= (setq end (1- end)) 0) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1282 (push (pop path) res)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1283 (nreverse res)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1284 "."))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1285 (push |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1286 (vector (nnir-group-full-name group server) art 0) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1287 artlist)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1288 (forward-line 1))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1289 (message "Searching %s using find-grep...done" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1290 (or group server)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1291 artlist))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1292 grouplist)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1293 |
111288 | 1294 (declare-function mm-url-insert "mm-url" (url &optional follow-refresh)) |
1295 (declare-function mm-url-encode-www-form-urlencoded "mm-url" (pairs)) | |
1296 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1297 ;; gmane interface |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1298 (defun nnir-run-gmane (query srv &optional groups) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1299 "Run a search against a gmane back-end server." |
111294
cda54a3ff09d
gnus-util.el (gnus-string-match-p): New function, that is an alias to string-match-p in Emacs >=23.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111288
diff
changeset
|
1300 (if (gnus-string-match-p "gmane" srv) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1301 (let* ((case-fold-search t) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1302 (qstring (cdr (assq 'query query))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1303 (server (cadr (gnus-server-to-method srv))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1304 (groupspec (if groups |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1305 (mapconcat |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1306 (function (lambda (x) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1307 (format "group:%s" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1308 (gnus-group-short-name x)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1309 groups " ") "")) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1310 (authorspec |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1311 (if (assq 'author query) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1312 (format "author:%s" (cdr (assq 'author query))) "")) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1313 (search (format "%s %s %s" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1314 qstring groupspec authorspec)) |
111314
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1315 (gnus-inhibit-demon t) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1316 artlist) |
111288 | 1317 (require 'mm-url) |
111669
ed117caa918e
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111584
diff
changeset
|
1318 (with-current-buffer (get-buffer-create nnir-tmp-buffer) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1319 (erase-buffer) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1320 (mm-url-insert |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1321 (concat |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1322 "http://search.gmane.org/nov.php" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1323 "?" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1324 (mm-url-encode-www-form-urlencoded |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1325 `(("query" . ,search) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1326 ("HITSPERPAGE" . "999"))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1327 (unless (featurep 'xemacs) (set-buffer-multibyte t)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1328 (mm-decode-coding-region (point-min) (point-max) 'utf-8) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1329 (goto-char (point-min)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1330 (forward-line 1) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1331 (while (not (eobp)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1332 (unless (or (eolp) (looking-at "\x0d")) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1333 (let ((header (nnheader-parse-nov))) |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1334 (let ((xref (mail-header-xref header)) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1335 (xscore (string-to-number (cdr (assoc 'X-Score |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1336 (mail-header-extra header)))))) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1337 (when (string-match " \\([^:]+\\)[:/]\\([0-9]+\\)" xref) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1338 (push |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1339 (vector |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1340 (gnus-group-prefixed-name (match-string 1 xref) srv) |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1341 (string-to-number (match-string 2 xref)) xscore) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1342 artlist))))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1343 (forward-line 1))) |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1344 ;; Sort by score |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1345 (apply 'vector |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1346 (sort artlist |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1347 (function (lambda (x y) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1348 (> (nnir-artitem-rsv x) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1349 (nnir-artitem-rsv y))))))) |
111314
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1350 (message "Can't search non-gmane nntp groups") |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1351 nil)) |
95610 | 1352 |
1353 ;;; Util Code: | |
1354 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1355 (defun nnir-read-parms (query nnir-search-engine) |
95610 | 1356 "Reads additional search parameters according to `nnir-engines'." |
1357 (let ((parmspec (caddr (assoc nnir-search-engine nnir-engines)))) | |
111314
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1358 (append query |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1359 (mapcar 'nnir-read-parm parmspec)))) |
95610 | 1360 |
1361 (defun nnir-read-parm (parmspec) | |
1362 "Reads a single search parameter. | |
1363 `parmspec' is a cons cell, the car is a symbol, the cdr is a prompt." | |
1364 (let ((sym (car parmspec)) | |
1365 (prompt (cdr parmspec))) | |
1366 (if (listp prompt) | |
110874
7996424ed273
nnir.el (nnir-read-parm): Fix call to gnus-completing-read.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110790
diff
changeset
|
1367 (let* ((result (apply 'gnus-completing-read prompt)) |
95610 | 1368 (mapping (or (assoc result nnir-imap-search-arguments) |
110908
2a4bfc24abf0
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110898
diff
changeset
|
1369 (cons nil nnir-imap-search-other)))) |
95610 | 1370 (cons sym (format (cdr mapping) result))) |
1371 (cons sym (read-string prompt))))) | |
1372 | |
111491
ea2c0f22a4ad
* lisp/gnus/nnir.el (gnus-group-topic-name): Autoload.
Glenn Morris <rgm@gnu.org>
parents:
111482
diff
changeset
|
1373 (autoload 'gnus-group-topic-name "gnus-topic") |
ea2c0f22a4ad
* lisp/gnus/nnir.el (gnus-group-topic-name): Autoload.
Glenn Morris <rgm@gnu.org>
parents:
111482
diff
changeset
|
1374 |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1375 (defun nnir-run-query (query nserver) |
95610 | 1376 "Invoke appropriate search engine function (see `nnir-engines'). |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1377 If some groups were process-marked, run the query for each of the groups |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1378 and concat the results." |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1379 (let ((q (car (read-from-string query))) |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1380 (groups (if (string= "all-ephemeral" nserver) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1381 (with-current-buffer gnus-server-buffer |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1382 (list (list (gnus-server-server-name)))) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1383 (nnir-sort-groups-by-server |
111314
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1384 (or gnus-group-marked |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1385 (if (gnus-group-group-name) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1386 (list (gnus-group-group-name)) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1387 (cdr (assoc (gnus-group-topic-name) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1388 gnus-topic-alist)))))))) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1389 (apply 'vconcat |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1390 (mapcar (lambda (x) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1391 (let* ((server (car x)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1392 (nnir-search-engine |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1393 (or (nnir-read-server-parm 'nnir-search-engine |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1394 server) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1395 (cdr (assoc (car |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1396 (gnus-server-to-method server)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1397 nnir-method-default-engines)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1398 search-func) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1399 (setq search-func (cadr |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1400 (assoc nnir-search-engine |
111138
11259a64bfc0
gnus-sum.el (gnus-summary-select-article): Make sure we have the original article buffer live.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
110908
diff
changeset
|
1401 nnir-engines))) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1402 (if search-func |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1403 (funcall search-func |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1404 (if nnir-extra-parms |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1405 (nnir-read-parms q nnir-search-engine) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1406 q) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1407 server (cdr x)) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1408 nil))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1409 groups)))) |
95610 | 1410 |
1411 (defun nnir-read-server-parm (key server) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1412 "Returns the parameter value of key for the given server, where |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1413 server is of form 'backend:name'." |
95610 | 1414 (let ((method (gnus-server-to-method server))) |
1415 (cond ((and method (assq key (cddr method))) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1416 (nth 1 (assq key (cddr method)))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1417 (t nil)))) |
95610 | 1418 |
1419 (defun nnir-group-full-name (shortname server) | |
1420 "For the given group name, return a full Gnus group name. | |
1421 The Gnus backend/server information is added." | |
1422 (gnus-group-prefixed-name shortname (gnus-server-to-method server))) | |
1423 | |
1424 (defun nnir-possibly-change-server (server) | |
1425 (unless (and server (nnir-server-opened server)) | |
1426 (nnir-open-server server))) | |
1427 | |
1428 | |
1429 ;; Data type article list. | |
1430 | |
1431 (defun nnir-artlist-length (artlist) | |
1432 "Returns number of articles in artlist." | |
1433 (length artlist)) | |
1434 | |
1435 (defun nnir-artlist-article (artlist n) | |
1436 "Returns from ARTLIST the Nth artitem (counting starting at 1)." | |
1437 (elt artlist (1- n))) | |
1438 | |
1439 (defun nnir-artitem-group (artitem) | |
1440 "Returns the group from the ARTITEM." | |
1441 (elt artitem 0)) | |
1442 | |
1443 (defun nnir-artlist-artitem-group (artlist n) | |
1444 "Returns from ARTLIST the group of the Nth artitem (counting from 1)." | |
1445 (nnir-artitem-group (nnir-artlist-article artlist n))) | |
1446 | |
1447 (defun nnir-artitem-number (artitem) | |
1448 "Returns the number from the ARTITEM." | |
1449 (elt artitem 1)) | |
1450 | |
1451 (defun nnir-artlist-artitem-number (artlist n) | |
1452 "Returns from ARTLIST the number of the Nth artitem (counting from 1)." | |
1453 (nnir-artitem-number (nnir-artlist-article artlist n))) | |
1454 | |
1455 (defun nnir-artitem-rsv (artitem) | |
1456 "Returns the Retrieval Status Value (RSV, score) from the ARTITEM." | |
1457 (elt artitem 2)) | |
1458 | |
1459 (defun nnir-artlist-artitem-rsv (artlist n) | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1460 "Returns from ARTLIST the Retrieval Status Value of the Nth |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1461 artitem (counting from 1)." |
95610 | 1462 (nnir-artitem-rsv (nnir-artlist-article artlist n))) |
1463 | |
1464 ;; unused? | |
1465 (defun nnir-artlist-groups (artlist) | |
1466 "Returns a list of all groups in the given ARTLIST." | |
1467 (let ((res nil) | |
1468 (with-dups nil)) | |
1469 ;; from each artitem, extract group component | |
1470 (setq with-dups (mapcar 'nnir-artitem-group artlist)) | |
1471 ;; remove duplicates from above | |
1472 (mapc (function (lambda (x) (add-to-list 'res x))) | |
1473 with-dups) | |
1474 res)) | |
1475 | |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1476 (defun nnir-sort-groups-by-server (groups) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1477 "sorts a list of groups into an alist keyed by server" |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1478 (if (car groups) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1479 (let (value) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1480 (dolist (var groups value) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1481 (let ((server (gnus-group-server var))) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1482 (if (assoc server value) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1483 (nconc (cdr (assoc server value)) (list var)) |
111482
0aa164743cb3
nnir.el (nnir-request-move-article): fix to provide original group and subject.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111430
diff
changeset
|
1484 (push (cons server (list var)) value)))) |
111245
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1485 value) |
dd1304e89176
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111217
diff
changeset
|
1486 nil)) |
95610 | 1487 |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1488 (defun nnir-get-active (srv) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1489 (let ((method (gnus-server-to-method srv)) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1490 groups) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1491 (gnus-request-list method) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1492 (with-current-buffer nntp-server-buffer |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1493 (let ((cur (current-buffer)) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1494 name) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1495 (goto-char (point-min)) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1496 (unless (string= gnus-ignored-newsgroups "") |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1497 (delete-matching-lines gnus-ignored-newsgroups)) |
111314
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1498 (while (not (eobp)) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1499 (ignore-errors |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1500 (push (mm-string-as-unibyte |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1501 (let ((p (point))) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1502 (skip-chars-forward "^ \t\\\\") |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1503 (setq name (buffer-substring (+ p 1) (- (point) 1))) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1504 (gnus-group-full-name name method))) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1505 groups)) |
1431aee91437
nnir.el: Fix various bugs.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111294
diff
changeset
|
1506 (forward-line)))) |
111269
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1507 groups)) |
3d7a1caabf14
Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
111245
diff
changeset
|
1508 |
95610 | 1509 ;; The end. |
1510 (provide 'nnir) | |
1511 | |
95616 | 1512 ;;; nnir.el ends here |