X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnwarchive.el;h=4057db58aca079aada1a6dc33bde45198d4017a4;hb=9666b624de9a725ca0ba06db23573ae684359225;hp=33bd5ea81b151e2f66adb885aa583ea413a6b451;hpb=73edf76920c3d86afa1628ca8f1509394cb7b26c;p=elisp%2Fgnus.git-

diff --git a/lisp/nnwarchive.el b/lisp/nnwarchive.el
index 33bd5ea..4057db5 100644
--- a/lisp/nnwarchive.el
+++ b/lisp/nnwarchive.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1999 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
-;; Keywords: news
+;; Keywords: news egroups mail-archive
 
 ;; This file is part of GNU Emacs.
 
@@ -23,16 +23,12 @@
 
 ;;; Commentary:
 
-;; Note: You need to have `url' and `w3' installed for this backend to
-;; work.
+;; Note: You need to have `url' (w3 0.46) or greater version
+;; installed for this backend to work.
 
-;; A lot of codes stolen from mail-source, nnslashdot, nnweb.
-
-;; Todo: To support more web archives.
-
-;; Known bugs: in w3 0.44, there are two copies of url-maybe-relative.
-;; If it is loaded from w3.el, (load-library "url").  w3 0.45 should
-;; work.
+;; Todo: 
+;; 1. To support more web archives.
+;; 2. Generalize webmail to other MHonArc archive.
 
 ;;; Code:
 
@@ -42,6 +38,7 @@
 (require 'message)
 (require 'gnus-util)
 (require 'gnus)
+(require 'gnus-bcklg)
 (require 'nnmail)
 (require 'mm-util)
 (require 'mail-source)
@@ -60,38 +57,57 @@
 
 (nnoo-declare nnwarchive)
 
-(eval-and-compile
-  (defvar nnwarchive-type-definition
-    '((egroups
-       (open-url 
-	"http://www.egroups.com/register?method=loginAction&email=%s&password=%s" 
-	login passwd)
-       (list-url 
-	"http://www.egroups.com/UserGroupsPage?")
-       (list-dissect . nnwarchive-egroups-list)
-       (list-groups . nnwarchive-egroups-list-groups)
-       (xover-url 
-	"http://www.egroups.com/group/%s/?fetchForward=1&start=%d" group start)
-       (xover-last-url 
-	"http://www.egroups.com/group/%s/?fetchForward=1" group)
-       (xover-page-size . 13)
-       (xover-dissect . nnwarchive-egroups-xover)
-       (article-url 
-	"http://www.egroups.com/group/%s/%d.html?raw=1" group article)
-       (article-dissect . nnwarchive-egroups-article)))))
-  
-(eval-and-compile
-  (defvar nnwarchive-short-names
-    '(login passwd)))
+(defvar nnwarchive-type-definition
+  '((egroups
+     (address . "www.egroups.com")
+     (open-url 
+      "http://www.egroups.com/register?method=loginAction&email=%s&password=%s" 
+      nnwarchive-login nnwarchive-passwd)
+     (list-url 
+      "http://www.egroups.com/UserGroupsPage?")
+     (list-dissect . nnwarchive-egroups-list)
+     (list-groups . nnwarchive-egroups-list-groups)
+     (xover-url 
+      "http://www.egroups.com/group/%s/?fetchForward=1&start=%d" group aux)
+     (xover-last-url 
+      "http://www.egroups.com/group/%s/?fetchForward=1" group)
+     (xover-page-size . 13)
+     (xover-dissect . nnwarchive-egroups-xover)
+     (article-url 
+      "http://www.egroups.com/group/%s/%d.html?raw=1" group article)
+     (article-dissect . nnwarchive-egroups-article)
+     (authentication . t)
+     (article-offset . 0)
+     (xover-files . nnwarchive-egroups-xover-files))
+    (mail-archive
+     (address . "www.mail-archive.com")
+     (open-url)
+     (list-url 
+      "http://www.mail-archive.com/lists.html")
+     (list-dissect . nnwarchive-mail-archive-list)
+     (list-groups . nnwarchive-mail-archive-list-groups)
+     (xover-url 
+      "http://www.mail-archive.com/%s/mail%d.html" group aux)
+     (xover-last-url 
+      "http://www.mail-archive.com/%s/maillist.html" group)
+     (xover-page-size)
+     (xover-dissect . nnwarchive-mail-archive-xover)
+     (article-url 
+      "http://www.mail-archive.com/%s/msg%05d.html" group article1)
+     (article-dissect . nnwarchive-mail-archive-article)
+     (xover-files . nnwarchive-mail-archive-xover-files)
+     (authentication)
+     (article-offset . 1))))
+
+(defvar nnwarchive-default-type 'egroups)
 
 (defvoo nnwarchive-directory (nnheader-concat gnus-directory "warchive/")
   "Where nnwarchive will save its files.")
 
-(eval-and-compile
-  (defvoo nnwarchive-type 'egroups
-    "The type of nnwarchive."))
+(defvoo nnwarchive-type nil
+    "The type of nnwarchive.")
 
-(defvoo nnwarchive-address "egroups.com"
+(defvoo nnwarchive-address ""
   "The address of nnwarchive.")
 
 (defvoo nnwarchive-login nil
@@ -104,138 +120,148 @@
 
 (defvoo nnwarchive-headers-cache nil)
 
-(defvoo nnwarchive-opened nil)
+(defvoo nnwarchive-authentication nil)
+
+(defvoo nnwarchive-nov-is-evil nil)
 
 (defconst nnwarchive-version "nnwarchive 1.0")
 
 ;;; Internal variables
 
-(defvar nnwarchive-open-url nil)
-(defvar nnwarchive-open-dissect nil)
+(defvoo nnwarchive-open-url nil)
+(defvoo nnwarchive-open-dissect nil)
+
+(defvoo nnwarchive-list-url nil)
+(defvoo nnwarchive-list-dissect nil)
+(defvoo nnwarchive-list-groups nil)
+
+(defvoo nnwarchive-xover-files nil)
+(defvoo nnwarchive-xover-url nil)
+(defvoo nnwarchive-xover-last-url nil)
+(defvoo nnwarchive-xover-dissect nil)
+(defvoo nnwarchive-xover-page-size nil)
 
-(defvar nnwarchive-list-url nil)
-(defvar nnwarchive-list-dissect nil)
-(defvar nnwarchive-list-groups nil)
+(defvoo nnwarchive-article-url nil)
+(defvoo nnwarchive-article-dissect nil)
+(defvoo nnwarchive-xover-files nil)
+(defvoo nnwarchive-article-offset 0)
 
-(defvar nnwarchive-xover-url nil)
-(defvar nnwarchive-xover-last-url nil)
-(defvar nnwarchive-xover-dissect nil)
-(defvar nnwarchive-xover-page-size nil)
+(defvoo nnwarchive-buffer nil)
 
-(defvar nnwarchive-article-url nil)
-(defvar nnwarchive-article-dissect nil)
+(defvoo nnwarchive-keep-backlog 300)
+(defvar nnwarchive-backlog-articles nil)
+(defvar nnwarchive-backlog-hashtb nil)
 
-(defvar nnwarchive-buffer nil)
+(defvoo nnwarchive-headers nil)
 
-(defvar nnwarchive-headers nil)
 
 ;;; Interface functions
 
 (nnoo-define-basics nnwarchive)
 
-(eval-and-compile
-  (defun nnwarchive-bind-1 ()
-    (let ((defaults (cdr (assq nnwarchive-type nnwarchive-type-definition)))
-	  (short-names nnwarchive-short-names)
-	  default bind)
-      (while (setq default (pop defaults))
-	(push (list (intern (concat "nnwarchive-" (symbol-name (car default))))
-		    (list 'quote (cdr default))) bind))
-      (while (setq default (pop short-names))
-	(push (list default
-		    (intern (concat "nnwarchive-" 
-				    (symbol-name default)))) 
-	      bind))
-      bind)))
-
-(defmacro nnwarchive-bind (&rest body)
-  "Return a `let' form that binds all variables in TYPE.
-Read `mail-source-bind' for details."
-  `(let ,(nnwarchive-bind-1)
-     ,@body))
-
-(put 'nnwarchive-bind 'lisp-indent-function 0)
-(put 'nnwarchive-bind 'edebug-form-spec '(form body))
+(defun nnwarchive-set-default (type)
+  (let ((defs (cdr (assq type nnwarchive-type-definition)))
+	def)
+    (dolist (def defs)
+      (set (intern (concat "nnwarchive-" (symbol-name (car def)))) 
+	   (cdr def)))))
+
+(defmacro nnwarchive-backlog (&rest form)
+  `(let ((gnus-keep-backlog nnwarchive-keep-backlog)
+	 (gnus-backlog-buffer 
+	  (format " *nnwarchive backlog %s*" nnwarchive-address))
+	 (gnus-backlog-articles nnwarchive-backlog-articles)
+	 (gnus-backlog-hashtb nnwarchive-backlog-hashtb))
+     (unwind-protect
+	 (progn ,@form)
+       (setq nnwarchive-backlog-articles gnus-backlog-articles
+	     nnwarchive-backlog-hashtb gnus-backlog-hashtb))))
+(put 'nnwarchive-backlog 'lisp-indent-function 0)
+(put 'nnwarchive-backlog 'edebug-form-spec '(form body))
+
+(defun nnwarchive-backlog-enter-article (group number buffer)
+  (nnwarchive-backlog
+    (gnus-backlog-enter-article group number buffer)))
+
+(defun nnwarchive-get-article (article &optional group server buffer) 
+  (if (numberp article)
+      (if (nnwarchive-backlog
+	    (gnus-backlog-request-article group article 
+					  (or buffer nntp-server-buffer)))
+	  (cons group article)
+	(let (contents)
+	  (save-excursion
+	    (set-buffer nnwarchive-buffer)
+	    (goto-char (point-min))
+	    (let ((article1 (- article nnwarchive-article-offset)))
+	      (nnwarchive-url nnwarchive-article-url))
+	    (setq contents (funcall nnwarchive-article-dissect group article)))
+	  (when contents
+	    (save-excursion
+	      (set-buffer (or buffer nntp-server-buffer))
+	      (erase-buffer)
+	      (insert contents)
+	      (nnwarchive-backlog-enter-article group article (current-buffer))
+	      (nnheader-report 'nnwarchive "Fetched article %s" article)
+	      (cons group article)))))
+    nil))
 
 (deffoo nnwarchive-retrieve-headers (articles &optional group server fetch-old)
   (nnwarchive-possibly-change-server group server)
-  (nnwarchive-bind 
+  (if (or gnus-nov-is-evil nnwarchive-nov-is-evil)
+      (with-temp-buffer
+	(with-current-buffer nntp-server-buffer
+	  (erase-buffer))
+	(let ((buf (current-buffer)) b e)
+	  (dolist (art articles)
+	    (nnwarchive-get-article art group server buf)
+	    (setq b (goto-char (point-min)))
+	    (if (search-forward "\n\n" nil t)
+		(forward-char -1)
+	      (goto-char (point-max)))
+	    (setq e (point))
+	    (with-current-buffer nntp-server-buffer
+	      (insert (format "221 %d Article retrieved.\n" art))
+	      (insert-buffer-substring buf b e)
+	      (insert ".\n"))))
+	'headers)
     (setq nnwarchive-headers (cdr (assoc group nnwarchive-headers-cache)))
     (save-excursion
       (set-buffer nnwarchive-buffer)
       (erase-buffer)
-      (let (point start starts)
-	(setq starts (nnwarchive-paged (sort articles '<)))
-	(while (setq start (pop starts))
-	  (goto-char (point-max))
-	  (nnwarchive-url nnwarchive-xover-url))
-	(if nnwarchive-xover-dissect
-	    (funcall nnwarchive-xover-dissect))))
+      (funcall nnwarchive-xover-files group articles))
     (save-excursion
       (set-buffer nntp-server-buffer)
       (erase-buffer)
       (let (header)
-	(dolist (art articles)
-	  (if (setq header (assq art nnwarchive-headers))
-	      (nnheader-insert-nov (cdr header))))))
+      (dolist (art articles)
+	(if (setq header (assq art nnwarchive-headers))
+	    (nnheader-insert-nov (cdr header))))))
     (let ((elem (assoc group nnwarchive-headers-cache)))
       (if elem
 	  (setcdr elem nnwarchive-headers)
 	(push (cons group nnwarchive-headers) nnwarchive-headers-cache)))
     'nov))
 
-(deffoo nnwarchive-retrieve-groups (groups &optional server)
-  "Retrieve group info on GROUPS."
-  (nnwarchive-possibly-change-server nil server)
-  (nnwarchive-bind 
-    (if nnwarchive-list-groups
-	(funcall nnwarchive-list-groups groups))
-    (nnwarchive-write-groups)
-    (nnwarchive-generate-active)
-    'active))
-
 (deffoo nnwarchive-request-group (group &optional server dont-check)
   (nnwarchive-possibly-change-server nil server)
-  (nnwarchive-bind 
-    (if nnwarchive-list-groups
-	(funcall nnwarchive-list-groups (list group)))
-    (nnwarchive-write-groups)
-    (let ((elem (assoc group nnwarchive-groups)))
-      (cond
-       ((not elem)
-	(nnheader-report 'nnwarchive "Group does not exist"))
-       (t
-	(nnheader-report 'nnwarchive "Opened group %s" group)
-	(nnheader-insert
-	 "211 %d %d %d %s\n" (or (cadr elem) 0) 1 (or (cadr elem) 0)
-	 (prin1-to-string group))
-	t)))))
-
-(deffoo nnwarchive-close-group (group &optional server)
-  (nnwarchive-possibly-change-server group server)
-  (nnwarchive-bind
-    (when (gnus-buffer-live-p nnwarchive-buffer)
-      (save-excursion
-	(set-buffer nnwarchive-buffer)
-      (kill-buffer nnwarchive-buffer)))
-    t))
+  (when (and (not dont-check) nnwarchive-list-groups)
+    (funcall nnwarchive-list-groups (list group))
+    (nnwarchive-write-groups))
+  (let ((elem (assoc group nnwarchive-groups)))
+    (cond
+     ((not elem)
+      (nnheader-report 'nnwarchive "Group does not exist"))
+     (t
+      (nnheader-report 'nnwarchive "Opened group %s" group)
+      (nnheader-insert
+       "211 %d %d %d %s\n" (or (cadr elem) 0) 1 (or (cadr elem) 0)
+       (prin1-to-string group))
+      t))))
 
 (deffoo nnwarchive-request-article (article &optional group server buffer)
   (nnwarchive-possibly-change-server group server)
-  (nnwarchive-bind 
-    (let (contents)
-      (save-excursion
-	(set-buffer nnwarchive-buffer)
-	(goto-char (point-min))
-	(nnwarchive-url nnwarchive-article-url)
-	(setq contents (funcall nnwarchive-article-dissect)))
-      (when contents
-	(save-excursion
-	  (set-buffer (or buffer nntp-server-buffer))
-	  (erase-buffer)
-	  (insert contents)
-	  (nnheader-report 'nnwarchive "Fetched article %s" article)
-	  (cons group article))))))
+  (nnwarchive-get-article article group server buffer))
 
 (deffoo nnwarchive-close-server (&optional server)
   (when (and (nnwarchive-server-opened server)
@@ -243,59 +269,48 @@ Read `mail-source-bind' for details."
     (save-excursion
       (set-buffer nnwarchive-buffer)
       (kill-buffer nnwarchive-buffer)))
+  (nnwarchive-backlog
+    (gnus-backlog-shutdown))
   (nnoo-close-server 'nnwarchive server))
 
 (deffoo nnwarchive-request-list (&optional server)
   (nnwarchive-possibly-change-server nil server)
-  (nnwarchive-bind
-    (save-excursion
-      (set-buffer nnwarchive-buffer)
-      (erase-buffer)
-      (if nnwarchive-list-url
-	  (nnwarchive-url nnwarchive-list-url))
-      (if nnwarchive-list-dissect
-	  (funcall nnwarchive-list-dissect))
-      (nnwarchive-write-groups)
-      (nnwarchive-generate-active)))
-  'active)
-
-(deffoo nnwarchive-request-newgroups (date &optional server)
-  (nnwarchive-possibly-change-server nil server)
-  (nnwarchive-bind
+  (save-excursion
+    (set-buffer nnwarchive-buffer)
+    (erase-buffer)
+    (if nnwarchive-list-url
+	(nnwarchive-url nnwarchive-list-url))
+    (if nnwarchive-list-dissect
+	(funcall nnwarchive-list-dissect))
     (nnwarchive-write-groups)
     (nnwarchive-generate-active))
-  'active)
-
-(deffoo nnwarchive-asynchronous-p ()
-  nil)
-
-(deffoo nnwarchive-server-opened (&optional server)
-  nnwarchive-opened)
+  t)
 
 (deffoo nnwarchive-open-server (server &optional defs connectionless)
   (nnwarchive-init server)
   (if (nnwarchive-server-opened server)
       t
-    (setq nnwarchive-login
-	  (or nnwarchive-login
-	      (read-string
-	       (format "Login at %s: " server)
-	       user-mail-address)))
-    (setq nnwarchive-passwd
-	  (or nnwarchive-passwd
-	      (mail-source-read-passwd
-	     (format "Password for %s at %s: " nnwarchive-login server))))
-    (nnwarchive-bind 
-      (unless nnwarchive-groups
-	(nnwarchive-read-groups))
-      (save-excursion
-	(set-buffer nnwarchive-buffer)
-	(erase-buffer)
-	(if nnwarchive-open-url
+    (nnoo-change-server 'nnwarchive server defs)
+    (when nnwarchive-authentication
+      (setq nnwarchive-login
+	    (or nnwarchive-login
+		(read-string
+		 (format "Login at %s: " server)
+		 user-mail-address)))
+      (setq nnwarchive-passwd
+	    (or nnwarchive-passwd
+		(mail-source-read-passwd
+		 (format "Password for %s at %s: " 
+			 nnwarchive-login server)))))
+    (unless nnwarchive-groups
+      (nnwarchive-read-groups))
+    (save-excursion
+      (set-buffer nnwarchive-buffer)
+      (erase-buffer)
+      (if nnwarchive-open-url
 	  (nnwarchive-url nnwarchive-open-url))
-	(if nnwarchive-open-dissect
-	    (funcall nnwarchive-open-dissect))
-	(setq nnwarchive-opened t)))
+      (if nnwarchive-open-dissect
+	  (funcall nnwarchive-open-dissect)))
     t))
 
 (nnoo-define-skeleton nnwarchive)
@@ -324,13 +339,28 @@ Read `mail-source-bind' for details."
 
 (defun nnwarchive-init (server)
   "Initialize buffers and such."
+  (let ((type (intern server)) (defs nnwarchive-type-definition) def)
+    (cond 
+     ((equal server "")
+      (setq type nnwarchive-default-type))
+     ((assq type nnwarchive-type-definition) t)
+     (t
+      (setq type nil)
+      (while (setq def (pop defs))
+	(when (equal (cdr (assq 'address (cdr def))) server)
+	  (setq defs nil)
+	  (setq type (car def))))
+      (unless type
+	(error "Undefined server %s" server))))
+    (setq nnwarchive-type type))
   (unless (file-exists-p nnwarchive-directory)
     (gnus-make-directory nnwarchive-directory))
   (unless (gnus-buffer-live-p nnwarchive-buffer)
     (setq nnwarchive-buffer
 	  (save-excursion
 	    (nnheader-set-temp-buffer
-	     (format " *nnwarchive %s %s*" nnwarchive-type server))))))
+	     (format " *nnwarchive %s %s*" nnwarchive-type server)))))
+  (nnwarchive-set-default nnwarchive-type))
 
 (defun nnwarchive-encode-www-form-urlencoded (pairs)
   "Return PAIRS encoded for forms."
@@ -367,42 +397,6 @@ Read `mail-source-bind' for details."
      (t
       (nnweb-insert (apply 'format (nnwarchive-eval xurl)))))))
 
-(defun nnwarchive-decode-entities ()
-  (goto-char (point-min))
-  (while (re-search-forward "&\\(#[0-9]+\\|[a-z]+\\);" nil t)
-    (replace-match (char-to-string 
-		    (if (eq (aref (match-string 1) 0) ?\#)
-			(string-to-number (substring (match-string 1) 1))
-		      (or (cdr (assq (intern (match-string 1))
-				     w3-html-entities))
-			  ?#)))
-		   t t)))
-
-(defun nnwarchive-decode-entities-string (str)
-  (with-temp-buffer
-    (insert str)
-    (nnwarchive-decode-entities)
-    (buffer-substring (point-min) (point-max))))
-
-(defun nnwarchive-remove-markup ()
-  (goto-char (point-min))
-  (while (search-forward "<!--" nil t)
-    (delete-region (match-beginning 0)
-		   (or (search-forward "-->" nil t)
-		       (point-max))))
-  (goto-char (point-min))
-  (while (re-search-forward "<[^>]+>" nil t)
-    (replace-match "" t t)))
-
-(defun nnwarchive-date-to-date (sdate)
-  (let ((elem (split-string sdate)))
-    (concat (substring (nth 0 elem) 0 3) " "
-	    (substring (nth 1 elem) 0 3) " "
-	    (substring (nth 2 elem) 0 2) " "
-	    (substring (nth 3 elem) 1 6) " "
-	    (format-time-string "%Y") " "
-	    (nth 4 elem))))
-
 (defun nnwarchive-generate-active ()
   (save-excursion
     (set-buffer nntp-server-buffer)
@@ -431,17 +425,17 @@ Read `mail-source-bind' for details."
 	(nnwarchive-url nnwarchive-xover-last-url)
 	(goto-char (point-min))
 	(when (re-search-forward "of \\([0-9]+\\)</title>" nil t)
-	(setq articles (string-to-number (match-string 1)))) 
+	  (setq articles (string-to-number (match-string 1)))) 
 	(let ((elem (assoc group nnwarchive-groups)))
-	(if elem
-	    (setcar (cdr elem) articles)
-	  (push (list group articles "") nnwarchive-groups)))
+	  (if elem
+	      (setcar (cdr elem) articles)
+	    (push (list group articles "") nnwarchive-groups)))
 	(setq nnwarchive-headers (cdr (assoc group nnwarchive-headers-cache)))
-      (nnwarchive-egroups-xover)
-      (let ((elem (assoc group nnwarchive-headers-cache)))
-	(if elem
-	    (setcdr elem nnwarchive-headers)
-	  (push (cons group nnwarchive-headers) nnwarchive-headers-cache)))))))
+	(nnwarchive-egroups-xover group)
+	(let ((elem (assoc group nnwarchive-headers-cache)))
+	  (if elem
+	      (setcdr elem nnwarchive-headers)
+	    (push (cons group nnwarchive-headers) nnwarchive-headers-cache)))))))
 
 (defun nnwarchive-egroups-list ()
   (let ((case-fold-search t)
@@ -458,41 +452,40 @@ Read `mail-source-bind' for details."
 	(setq articles (string-to-number (match-string 1)))) 
       (if (setq elem (assoc group nnwarchive-groups))
 	  (setcar (cdr elem) articles)
-	(push (list group articles description) nnwarchive-groups)))
-    (nnwarchive-egroups-list-groups (mapcar 'identity nnwarchive-groups)))
+	(push (list group articles description) nnwarchive-groups))))
   t)
 
-(defun nnwarchive-egroups-xover()
-  (let (article subject from date group)
+(defun nnwarchive-egroups-xover (group)
+  (let (article subject from date)
     (goto-char (point-min))
     (while (re-search-forward
 	    "<a href=\"/group/\\([^/]+\\)/\\([0-9]+\\)\\.html[^>]+>\\([^<]+\\)<"
 	    nil t)
-	  (setq group  (match-string 1)
-		article (string-to-number (match-string 2))
-		subject (match-string 3))
-	  (forward-line 1)
-	  (unless (assq article nnwarchive-headers)
-	    (if (looking-at "<td[^>]+><font[^>]+>\\([^<]+\\)</font>")
-		(setq from (match-string 1)))
-	    (forward-line 1)
-	    (if (looking-at "<td[^>]+><font[^>]+>\\([^<]+\\)</font>")
-		(setq date (identity (match-string 1))))
-	    (push (cons
-		   article
-		   (make-full-mail-header
-		    article 
-		    (nnwarchive-decode-entities-string subject)
-		    (nnwarchive-decode-entities-string from)
-		    date
-		    (concat "<" group "%"
-			    (number-to-string article) 
-			    "@egroup.com>")
-		    ""
-		    0 0 "")) nnwarchive-headers))))
+      (setq group  (match-string 1)
+	    article (string-to-number (match-string 2))
+	    subject (match-string 3))
+      (forward-line 1)
+      (unless (assq article nnwarchive-headers)
+	(if (looking-at "<td[^>]+><font[^>]+>\\([^<]+\\)</font>")
+	    (setq from (match-string 1)))
+	(forward-line 1)
+	(if (looking-at "<td[^>]+><font[^>]+>\\([^<]+\\)</font>")
+	    (setq date (identity (match-string 1))))
+	(push (cons
+	       article
+	       (make-full-mail-header
+		article 
+		(nnweb-decode-entities-string subject)
+		(nnweb-decode-entities-string from)
+		date
+		(concat "<" group "%"
+			(number-to-string article) 
+			"@egroup.com>")
+		""
+		0 0 "")) nnwarchive-headers))))
   nnwarchive-headers)
 
-(defun nnwarchive-egroups-article ()
+(defun nnwarchive-egroups-article (group articles)
   (goto-char (point-min))
   (if (search-forward "<pre>" nil t)
       (delete-region (point-min) (point)))
@@ -502,8 +495,262 @@ Read `mail-source-bind' for details."
   (goto-char (point-min))
   (while (re-search-forward "<a[^>]+>\\([^<]+\\)</a>" nil t)
     (replace-match "<\\1>"))
-  (nnwarchive-decode-entities)
-  (buffer-substring (point-min) (point-max)))
+  (nnweb-decode-entities)
+  (buffer-string))
+
+(defun nnwarchive-egroups-xover-files (group articles)
+  (let (aux auxs)
+    (setq auxs (nnwarchive-paged (sort articles '<)))
+    (while (setq aux (pop auxs))
+      (goto-char (point-max))
+      (nnwarchive-url nnwarchive-xover-url))
+    (if nnwarchive-xover-dissect
+	(nnwarchive-egroups-xover group))))
+
+;; mail-archive
+
+(defun nnwarchive-mail-archive-list-groups (groups)
+  (save-excursion
+    (let (articles)
+      (set-buffer nnwarchive-buffer)
+      (dolist (group groups)
+	(erase-buffer)
+	(nnwarchive-url nnwarchive-xover-last-url)
+	(goto-char (point-min))
+	(when (re-search-forward "msg\\([0-9]+\\)\\.html" nil t)
+	  (setq articles (1+ (string-to-number (match-string 1)))))
+	(let ((elem (assoc group nnwarchive-groups)))
+	  (if elem
+	      (setcar (cdr elem) articles)
+	    (push (list group articles "") nnwarchive-groups)))
+	(setq nnwarchive-headers (cdr (assoc group nnwarchive-headers-cache)))
+	(nnwarchive-mail-archive-xover group)
+	(let ((elem (assoc group nnwarchive-headers-cache)))
+	  (if elem
+	      (setcdr elem nnwarchive-headers)
+	    (push (cons group nnwarchive-headers) 
+		  nnwarchive-headers-cache)))))))
+
+(defun nnwarchive-mail-archive-list ()
+  (let ((case-fold-search t)
+	group description elem articles)
+    (goto-char (point-min))
+    (while (re-search-forward "<a href=\"\\([^/]+\\)/\">\\([^>]+\\)<" nil t)
+      (setq group (match-string 1)
+	    description (match-string 2))
+      (forward-line 1)
+      (setq articles 0)
+      (if (setq elem (assoc group nnwarchive-groups))
+	  (setcar (cdr elem) articles)
+	(push (list group articles description) nnwarchive-groups))))
+  t)
+
+(defun nnwarchive-mail-archive-xover (group)
+  (let (article subject from date)
+    (goto-char (point-min))
+    (while (re-search-forward
+	    "<A[^>]*HREF=\"msg\\([0-9]+\\)\\.html[^>]+>\\([^<]+\\)<"
+	    nil t)
+      (setq article (1+ (string-to-number (match-string 1)))
+	    subject (match-string 2))
+      (forward-line 1)
+      (unless (assq article nnwarchive-headers)
+	(if (looking-at "<UL><LI><EM>From</EM>:\\([^&]+\\)<\\([^&]+\\)>")
+	    (progn
+	      (setq from (match-string 1)
+		    date (identity (match-string 2))))
+	  (setq from "" date ""))
+	(push (cons
+	       article
+	       (make-full-mail-header
+		article 
+		(nnweb-decode-entities-string subject)
+		(nnweb-decode-entities-string from)
+		date
+		(format "<%05d%%%s>\n" (1- article) group)
+		""
+		0 0 "")) nnwarchive-headers))))
+  nnwarchive-headers)
+
+(defun nnwarchive-mail-archive-xover-files (group articles)
+  (unless nnwarchive-headers
+    (erase-buffer)
+    (nnwarchive-url nnwarchive-xover-last-url)
+    (goto-char (point-min))
+    (nnwarchive-mail-archive-xover group))
+  (let ((minart (apply 'min articles))
+	(min (apply 'min (mapcar 'car nnwarchive-headers)))
+	(aux 2))
+    (while (> min minart)
+      (erase-buffer)
+      (nnwarchive-url nnwarchive-xover-url)
+      (nnwarchive-mail-archive-xover group)
+      (setq min (apply 'min (mapcar 'car nnwarchive-headers))))))
+
+(defvar nnwarchive-caesar-translation-table nil
+  "Modified rot13 table. tr/@A-Z[a-z/N-Z[@A-Mn-za-m/.")
+
+(defun nnwarchive-make-caesar-translation-table ()
+  "Create modified rot13 table. tr/@A-Z[a-z/N-Z[@A-Mn-za-m/."
+  (let ((i -1)
+	(table (make-string 256 0))
+	(a (mm-char-int ?a))
+	(A (mm-char-int ?A)))
+    (while (< (incf i) 256)
+      (aset table i i))
+    (concat
+     (substring table 0 (1- A))
+     (substring table (+ A 13) (+ A 27))
+     (substring table (1- A) (+ A 13))
+     (substring table (+ A 27) a)
+     (substring table (+ a 13) (+ a 26))
+     (substring table a (+ a 13))
+     (substring table (+ a 26) 255))))
+
+(defun nnwarchive-from-r13 (from-r13)
+  (when from-r13
+    (with-temp-buffer
+      (insert from-r13)
+      (let ((message-caesar-translation-table
+	     (or nnwarchive-caesar-translation-table
+		 (setq nnwarchive-caesar-translation-table 
+		       (nnwarchive-make-caesar-translation-table)))))
+	(message-caesar-region (point-min) (point-max))
+	(buffer-string)))))
+
+(defun nnwarchive-mail-archive-article (group article)
+  (let (p refs url mime e 
+	  from subject date id 
+	  done
+	  (case-fold-serch t))
+    (save-restriction
+      (goto-char (point-min))
+      (when (search-forward "X-Head-End" nil t)
+	(beginning-of-line)
+	(narrow-to-region (point-min) (point))
+	(nnweb-decode-entities)
+	(goto-char (point-min))
+	(while (search-forward "<!--X-" nil t)
+	  (replace-match ""))
+	(goto-char (point-min))
+	(while (search-forward " -->" nil t)
+	  (replace-match ""))
+	(setq from 
+	      (or (mail-fetch-field "from")
+		  (nnwarchive-from-r13 
+		   (mail-fetch-field "from-r13"))))
+	(setq date (mail-fetch-field "date"))
+	(setq id (mail-fetch-field "message-id"))
+	(setq subject (mail-fetch-field "subject"))
+	(goto-char (point-max))
+	(widen))
+      (when (search-forward "<ul>" nil t)
+	(forward-line)
+	(delete-region (point-min) (point))
+	(search-forward "</ul>" nil t)
+	(end-of-line)
+	(narrow-to-region (point-min) (point))
+	(nnweb-remove-markup)
+	(nnweb-decode-entities)
+	(goto-char (point-min))
+	(delete-blank-lines)
+	(when from
+	  (message-remove-header "from")
+	  (goto-char (point-max))
+	  (insert "From: " from "\n"))
+	(when subject
+	  (message-remove-header "subject")
+	  (goto-char (point-max))
+	  (insert "Subject: " subject "\n"))
+	(when id
+	  (goto-char (point-max))
+	  (insert "X-Message-ID: <" id ">\n"))
+	(when date
+	  (message-remove-header "date")
+	  (goto-char (point-max))
+	  (insert "Date: " date "\n"))
+	(goto-char (point-max))
+	(widen)
+	(insert "\n"))
+      (setq p (point)) 
+      (when (search-forward "X-Body-of-Message" nil t)
+	(forward-line)
+	(delete-region p (point))
+	(search-forward "X-Body-of-Message-End" nil t)
+	(beginning-of-line)
+	(save-restriction
+	  (narrow-to-region p (point))
+	  (goto-char (point-min))
+	  (if (> (skip-chars-forward "\040\n\r\t") 0)
+	      (delete-region (point-min) (point)))
+	  (while (not (eobp))
+	    (cond 
+	     ((looking-at "<PRE>\r?\n?") 
+	      (delete-region (match-beginning 0) (match-end 0))
+	      (setq p (point))
+	      (when (search-forward "</PRE>" nil t)
+		(delete-region (match-beginning 0) (match-end 0))
+		(save-restriction
+		  (narrow-to-region p (point))
+		  (nnweb-remove-markup)
+		  (nnweb-decode-entities)
+		  (goto-char (point-max)))))
+	     ((looking-at "<P><A HREF=\"\\([^\"]+\\)")
+	      (setq url (match-string 1))
+	      (delete-region (match-beginning 0) 
+			     (progn (forward-line) (point)))
+	      ;; I hate to download the url encode it, then immediately 
+	      ;; decode it.
+	      ;; FixMe: Find a better solution to attach the URL.
+	      ;; Maybe do some hack in external part of mml-generate-mim-1.
+	      (insert "<#part>"
+		      "\n--\nExternal: \n"
+		      (format "<URL:http://www.mail-archive.com/%s/%s>" 
+			      group url)
+		      "\n--\n"
+		      "<#/part>")
+	      (setq mime t))
+	     (t
+	      (setq p (point))
+	      (insert "<#part type=\"text/html\" disposition=inline>")
+	      (goto-char
+	       (if (re-search-forward 
+		    "[\040\n\r\t]*<PRE>\\|[\040\n\r\t]*<P><A HREF=\"" 
+		    nil t)
+		   (match-beginning 0)
+		 (point-max)))
+	      (insert "<#/part>")
+	      (setq mime t)))
+	    (setq p (point))
+	    (if (> (skip-chars-forward "\040\n\r\t") 0)
+		(delete-region p (point))))
+	  (goto-char (point-max))))
+      (setq p (point))
+      (when (search-forward "X-References-End" nil t)
+	(setq e (point))
+	(beginning-of-line)
+	(search-backward "X-References" p t)
+	(while (re-search-forward "msg\\([0-9]+\\)\\.html" e t)
+	  (push (concat "<" (match-string 1) "%" group ">") refs)))
+      (delete-region p (point-max))
+      (goto-char (point-min))
+      (insert (format "Message-ID: <%05d%%%s>\n" (1- article) group))
+      (when refs
+	(insert "References:")
+	(while refs
+	  (insert " " (pop refs)))
+	(insert "\n"))
+      (when mime
+	(unless (looking-at "$") 
+	  (search-forward "\n\n" nil t)
+	  (forward-line -1))
+	(narrow-to-region (point) (point-max))
+	(insert "MIME-Version: 1.0\n"
+		(prog1
+		    (mml-generate-mime)
+		  (delete-region (point-min) (point-max))))
+	(widen)))
+    (buffer-string)))
 
 (provide 'nnwarchive)