X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-nntp.el;h=f894d693069fc614b7322dd0060b91008cdbc45d;hb=2953f6f04147a85361880c1fb8485a38f66d1b0a;hp=2976e2ffb6502f420d555d8d3a4606376664fbff;hpb=3c569cdabc17804bf00b8a738e12f0664ca520e7;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-nntp.el b/elmo/elmo-nntp.el
index 2976e2f..f894d69 100644
--- a/elmo/elmo-nntp.el
+++ b/elmo/elmo-nntp.el
@@ -310,7 +310,7 @@ Don't cache if nil.")
 (defun elmo-nntp-send-mode-reader (session)
   (elmo-nntp-send-command session "mode reader")
   (if (null (elmo-nntp-read-response session t))
-      (error "Mode reader failed")))
+      (message "Mode reader failed")))
 
 (defun elmo-nntp-send-command (session command &optional noerase)
   (with-current-buffer (elmo-network-session-buffer session)
@@ -409,7 +409,7 @@ Don't cache if nil.")
 						      (and response group))
 	response))))
 
-(defun elmo-nntp-list-folders-get-cache (folder buf)
+(defun elmo-nntp-list-folders-get-cache (group server buf)
   (when (and elmo-nntp-list-folders-use-cache
 	     elmo-nntp-list-folders-cache
 	     (string-match (concat "^"
@@ -417,18 +417,24 @@ Don't cache if nil.")
 				    (or
 				     (nth 1 elmo-nntp-list-folders-cache)
 				     "")))
-			   (or folder "")))
+			   (or group ""))
+	     (string-match (concat "^"
+				   (regexp-quote
+				    (or
+				     (nth 2 elmo-nntp-list-folders-cache)
+				     "")))
+			   (or server "")))
     (let* ((cache-time (car elmo-nntp-list-folders-cache)))
       (unless (elmo-time-expire cache-time
 				elmo-nntp-list-folders-use-cache)
 	(save-excursion
 	  (set-buffer buf)
 	  (erase-buffer)
-	  (insert (nth 2 elmo-nntp-list-folders-cache))
+	  (insert (nth 3 elmo-nntp-list-folders-cache))
 	  (goto-char (point-min))
-	  (or (string= folder "")
-	      (and folder
-		   (keep-lines (concat "^" (regexp-quote folder) "\\."))))
+	  (or (string= group "")
+	      (and group
+		   (keep-lines (concat "^" (regexp-quote group) "\\."))))
 	  t
 	  )))))
 
@@ -450,6 +456,7 @@ Don't cache if nil.")
 
 (defun elmo-nntp-folder-list-subfolders (folder one-level)
   (let ((session (elmo-nntp-get-session folder))
+	(case-fold-search nil)
 	response ret-val top-ng append-serv use-list-active start)
     (with-temp-buffer
       (set-buffer-multibyte nil)
@@ -461,6 +468,7 @@ Don't cache if nil.")
 	  (setq ret-val (list (elmo-nntp-folder-group-internal folder))))
       (unless (setq response (elmo-nntp-list-folders-get-cache
 			      (elmo-nntp-folder-group-internal folder)
+			      (elmo-net-folder-server-internal folder)
 			      (current-buffer)))
 	(when (setq use-list-active (elmo-nntp-list-active-p session))
 	  (elmo-nntp-send-command
@@ -480,6 +488,7 @@ Don't cache if nil.")
 		  (setq elmo-nntp-list-folders-cache
 			(list (current-time)
 			      (elmo-nntp-folder-group-internal folder)
+			      (elmo-net-folder-server-internal folder)
 			      response)))
 		(erase-buffer)
 		(insert response))
@@ -492,7 +501,7 @@ Don't cache if nil.")
 	      (error "NNTP List folders failed"))
 	  (when elmo-nntp-list-folders-use-cache
 	    (setq elmo-nntp-list-folders-cache
-		  (list (current-time) nil response)))
+		  (list (current-time) nil nil response)))
 	  (erase-buffer)
 	  (setq start nil)
 	  (while (string-match (concat "^"
@@ -1078,16 +1087,13 @@ Don't cache if nil.")
     (elmo-folder-set-killed-list-internal folder killed-list))
   t)
 
-(luna-define-method elmo-folder-exists-p ((folder elmo-nntp-folder))
+(luna-define-method elmo-folder-exists-p-plugged ((folder elmo-nntp-folder))
   (let ((session (elmo-nntp-get-session folder)))
-    (if (elmo-folder-plugged-p folder)
-	(progn
 	  (elmo-nntp-send-command
 	   session
 	   (format "group %s"
 		   (elmo-nntp-folder-group-internal folder)))
-	  (elmo-nntp-read-response session))
-      t)))
+    (elmo-nntp-read-response session)))
 
 (defun elmo-nntp-retrieve-field (spec field from-msgs)
   "Retrieve FIELD values from FROM-MSGS.
@@ -1157,6 +1163,8 @@ Returns a list of cons cells like (NUMBER . VALUE)"
 	(if from-msgs
 	    (elmo-list-filter from-msgs result)
 	  result)))
+     ((string= "body" search-key)
+      nil)
      (t
       (let ((val (elmo-filter-value condition))
 	    (negative (eq (elmo-filter-type condition) 'unmatch))
@@ -1205,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)))
 
@@ -1456,9 +1465,6 @@ Returns a list of cons cells like (NUMBER . VALUE)"
 (luna-define-method elmo-message-use-cache-p ((folder elmo-nntp-folder) number)
   elmo-nntp-use-cache)
 
-(luna-define-method elmo-folder-creatable-p ((folder elmo-nntp-folder))
-  nil)
-
 (defun elmo-nntp-parse-newsgroups (string &optional subscribe-only)
   (let ((nglist (elmo-parse string "[ \t\f\r\n,]*\\([^ \t\f\r\n,]+\\)"))
 	ngs)