X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Felmo-archive.el;h=2fb1c3c72afec9a7a3edb71a05f63aeec2e9a063;hb=a717271e46f76079d48f9f976807cfaeeb0a3f85;hp=f76d026b96fcfd97850c573ca9747666b0da0f5d;hpb=56146522133dc618336a5a16fd9e390fb84164d5;p=elisp%2Fwanderlust.git

diff --git a/elmo/elmo-archive.el b/elmo/elmo-archive.el
index f76d026..2fb1c3c 100644
--- a/elmo/elmo-archive.el
+++ b/elmo/elmo-archive.el
@@ -578,11 +578,11 @@ TYPE specifies the archiver's symbol."
   (elmo-archive-message-fetch-internal folder number))
 
 (luna-define-method elmo-folder-append-buffer ((folder elmo-archive-folder)
-					       unread &optional number)
-  (elmo-archive-folder-append-buffer folder unread number))
+					       &optional flag number)
+  (elmo-archive-folder-append-buffer folder flag number))
 
 ;; verrrrrry slow!!
-(defun elmo-archive-folder-append-buffer (folder unread number)
+(defun elmo-archive-folder-append-buffer (folder flag number)
   (let* ((type (elmo-archive-folder-archive-type-internal folder))
 	 (prefix (elmo-archive-folder-archive-prefix-internal folder))
 	 (arc (elmo-archive-get-archive-name folder))
@@ -621,8 +621,7 @@ TYPE specifies the archiver's symbol."
 	     nil))))))
 
 (luna-define-method elmo-folder-append-messages :around
-  ((folder elmo-archive-folder) src-folder numbers unread-marks
-   &optional same-number)
+  ((folder elmo-archive-folder) src-folder numbers &optional same-number)
   (let ((prefix (elmo-archive-folder-archive-prefix-internal folder)))
     (cond
      ((and same-number
@@ -915,9 +914,7 @@ TYPE specifies the archiver's symbol."
       (elmo-archive-msgdb-create-entity-subr number))))
 
 (luna-define-method elmo-folder-msgdb-create ((folder elmo-archive-folder)
-					      numbers new-mark
-					      already-mark seen-mark
-					      important-mark seen-list)
+					      numbers flag-table)
   (when numbers
     (save-excursion ;; 981005
       (if (and elmo-archive-use-izip-agent
@@ -925,17 +922,11 @@ TYPE specifies the archiver's symbol."
 		(elmo-archive-folder-archive-type-internal folder)
 		'cat-headers))
 	  (elmo-archive-msgdb-create-as-numlist-subr2
-	   folder numbers new-mark already-mark seen-mark important-mark
-	   seen-list)
+	   folder numbers flag-table)
 	(elmo-archive-msgdb-create-as-numlist-subr1
-	 folder numbers new-mark already-mark seen-mark important-mark
-	 seen-list)))))
-
-(defun elmo-archive-msgdb-create-as-numlist-subr1 (folder
-						   numlist new-mark
-						   already-mark seen-mark
-						   important-mark
-						   seen-list)
+	 folder numbers flag-table)))))
+
+(defun elmo-archive-msgdb-create-as-numlist-subr1 (folder numlist flag-table)
   (let* ((type (elmo-archive-folder-archive-type-internal folder))
 	 (file (elmo-archive-get-archive-name folder))
 	 (method (elmo-archive-get-method type 'cat))
@@ -961,17 +952,13 @@ TYPE specifies the archiver's symbol."
 		 (elmo-msgdb-overview-entity-get-number entity)
 		 (car entity)))
 	  (setq message-id (car entity))
-	  (setq seen (member message-id seen-list))
 	  (if (setq gmark
 		    (or (elmo-msgdb-global-mark-get message-id)
-			(if (elmo-file-cache-status
-			     (elmo-file-cache-get message-id))
-			    (if seen
-				nil
-			      already-mark)
-			  (if seen
-			      seen-mark
-			    new-mark))))
+			(elmo-msgdb-mark
+			 (elmo-flag-table-get flag-table message-id)
+			 (elmo-file-cache-status
+			  (elmo-file-cache-get message-id))
+			 'new)))
 	      (setq mark-alist
 		    (elmo-msgdb-mark-append
 		     mark-alist
@@ -989,10 +976,8 @@ TYPE specifies the archiver's symbol."
 
 ;;; info-zip agent
 (defun elmo-archive-msgdb-create-as-numlist-subr2 (folder
-						   numlist new-mark
-						   already-mark seen-mark
-						   important-mark
-						   seen-list)
+						   numlist
+						   flag-table)
   (let* ((delim1 elmo-mmdf-delimiter)		;; MMDF
 	 (delim2 elmo-unixmail-delimiter)	;; UNIX Mail
 	 (type (elmo-archive-folder-archive-type-internal folder))
@@ -1025,10 +1010,7 @@ TYPE specifies the archiver's symbol."
 	(goto-char (point-min))
 	(cond
 	 ((looking-at delim1)	;; MMDF
-	  (setq result (elmo-archive-parse-mmdf msgs
-						new-mark
-						already-mark seen-mark
-						seen-list))
+	  (setq result (elmo-archive-parse-mmdf msgs flag-table))
 	  (setq overview (append overview (nth 0 result)))
 	  (setq number-alist (append number-alist (nth 1 result)))
 	  (setq mark-alist (append mark-alist (nth 2 result))))
@@ -1047,13 +1029,10 @@ TYPE specifies the archiver's symbol."
 	   percent))))
     (list overview number-alist mark-alist)))
 
-(defun elmo-archive-parse-mmdf (msgs new-mark
-				     already-mark
-				     seen-mark
-				     seen-list)
+(defun elmo-archive-parse-mmdf (msgs flag-table)
   (let ((delim elmo-mmdf-delimiter)
 	number sp ep rest entity overview number-alist mark-alist ret-val
-	message-id seen gmark)
+	message-id gmark)
     (goto-char (point-min))
     (setq rest msgs)
     (while (and rest (re-search-forward delim nil t)
@@ -1076,23 +1055,20 @@ TYPE specifies the archiver's symbol."
 		 (elmo-msgdb-overview-entity-get-number entity)
 		 (car entity)))
 	  (setq message-id (car entity))
-	  (setq seen (member message-id seen-list))
 	  (if (setq gmark
 		    (or (elmo-msgdb-global-mark-get message-id)
-			(if (elmo-file-cache-status
-			     (elmo-file-cache-get message-id))
-			    (if seen
-				nil
-			      already-mark)
-			  (if seen
-			      seen-mark
-			    new-mark))))
+			(elmo-msgdb-mark
+			 (elmo-flag-table-get flag-table message-id)
+			 (elmo-file-cache-status
+			  (elmo-file-cache-get message-id))
+			 'new)))
 	      (setq mark-alist
 		    (elmo-msgdb-mark-append
 		     mark-alist
 		     (elmo-msgdb-overview-entity-get-number entity)
 		     gmark)))
-	  (setq ret-val (append ret-val (list overview number-alist mark-alist)))
+	  (setq ret-val (append ret-val (list overview number-alist
+					      mark-alist)))
 	  (widen)))
       (forward-line 1)
       (setq rest (cdr rest)))