* elmo-nntp.el (elmo-folder-search): Body search is to search from

cache even if the folder is plugged.
(elmo-nntp-search-primitive): Do nothing when body search is
invoked (although it is not used by the change above).
* elmo-multi.el (elmo-folder-search): Don't ignore error anymore.

diff --git a/elmo/ChangeLog b/elmo/ChangeLog
index e89782d..1148c13 100644 (file)
--- a/elmo/ChangeLog
+++ b/elmo/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-20  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * elmo-nntp.el (elmo-folder-search): Body search is to search from
+       cache even if the folder is plugged.
+       (elmo-nntp-search-primitive): Do nothing when body search is
+       invoked (although it is not used by the change above).
+       * elmo-multi.el (elmo-folder-search): Don't ignore error anymore.
+
 2002-12-20  Kenichi OKADA  <okada@opaopa.org>
 
        * elmo-version.el (elmo-version): Up to 2.11.1.

diff --git a/elmo/elmo-multi.el b/elmo/elmo-multi.el
index a4d0da5..bf636c0 100644 (file)
--- a/elmo/elmo-multi.el
+++ b/elmo/elmo-multi.el
@@ -540,9 +540,8 @@
                          (+
                           (* (elmo-multi-folder-divide-number-internal
                               folder) cur-number) x)))
-                      (ignore-errors
-                        (elmo-folder-search
-                         (car flds) condition))))))
+                      (elmo-folder-search
+                       (car flds) condition)))))
       (when numlist
        (setq numlist-list (cdr numlist-list)))
       (setq flds (cdr flds)))

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 74030a8..f894d69 100644 (file)
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -1164,8 +1164,7 @@ Returns a list of cons cells like (NUMBER . VALUE)"
            (elmo-list-filter from-msgs result)
          result)))
      ((string= "body" search-key)
-      (error
-"Search by BODY is not supported (Toggle the plug off to search from caches)"))
+      nil)
      (t
       (let ((val (elmo-filter-value condition))
            (negative (eq (elmo-filter-type condition) 'unmatch))
@@ -1214,7 +1213,8 @@ Returns a list of cons cells like (NUMBER . VALUE)"
 
 (luna-define-method elmo-folder-search :around ((folder elmo-nntp-folder)
                                                condition &optional from-msgs)
-  (if (elmo-folder-plugged-p folder)
+  (if (and (elmo-folder-plugged-p folder)
+          (not (string= "body" (elmo-filter-key condition))))
       (elmo-nntp-search-internal folder condition from-msgs)
     (luna-call-next-method)))