From: yamaoka Date: Wed, 24 May 2000 10:28:29 +0000 (+0000) Subject: Sync X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~50 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=326437c91d8739a57eba5bff4b113e8035889e4c;p=elisp%2Fgnus.git- Sync with `t-gnus-6_14'. --- diff --git a/ChangeLog b/ChangeLog index 0c368f6..1f273e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,11 @@ 2000-05-24 TSUCHIYA Masatoshi - * lisp/nnshimbun.el: Add `Yomiuri' support. + * lisp/nnshimbun.el: Add `ZDNet Japan', `Yomiuri', and `Wired + News' support. (nnshimbun-regexp-opt): New function. (nnshimbun-wired-get-all-headers): Replace regexp-opt with nnshimbun-regexp-opt. -2000-05-24 TSUCHIYA Masatoshi - - * lisp/nnshimbun.el: Add `Wired News' support. - 2000-05-24 Katsumi Yamaoka * lisp/gnus-group.el (gnus-group-make-shimbun-group): Complete diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el index eaedc43..96c3382 100644 --- a/lisp/nnshimbun.el +++ b/lisp/nnshimbun.el @@ -86,6 +86,13 @@ (coding-system . ,(if (boundp 'MULE) '*sjis* 'shift_jis)) (generate-nov . nnshimbun-yomiuri-generate-nov-database) (make-contents . nnshimbun-yomiuri-make-contents)) + (zdnet + (address . "zdnet") + (url . "http://zdseek.pub.softbank.co.jp/news/") + (groups "comp") + (coding-system . ,(if (boundp 'MULE) '*sjis* 'shift_jis)) + (generate-nov . nnshimbun-zdnet-generate-nov-database) + (make-contents . nnshimbun-zdnet-make-contents)) )) (defvoo nnshimbun-directory (nnheader-concat gnus-directory "shimbun/") @@ -239,7 +246,7 @@ (setq article (nnshimbun-search-id group article))) (if (integerp article) (if (nnshimbun-backlog - (gnus-backlog-request-article group article + (gnus-backlog-request-article group article (or to-buffer nntp-server-buffer))) (cons group article) (let (header contents) @@ -483,7 +490,7 @@ (defun nnshimbun-mime-encode-string (string) (mapconcat #'identity - (split-string + (split-string (with-temp-buffer (insert (nnweb-decode-entities-string string)) (rfc2047-encode-region (point-min) (point-max)) @@ -669,7 +676,7 @@ is enclosed by at least one regexp grouping construct." (forward-line 2) (delete-region (point) (point-max)) (goto-char (point-min)) - (let (headers) + (let ((case-fold-search t) headers) (while (re-search-forward "^" nil t) @@ -749,7 +756,7 @@ is enclosed by at least one regexp grouping construct." (erase-buffer) (nnshimbun-retrieve-url (format "%s/News/Oneweek/" nnshimbun-url) t) (goto-char (point-min)) - (let (headers) + (let ((case-fold-search t) headers) (while (search-forward "\n\n" nil t) (let ((subject (buffer-substring (point) (gnus-point-at-eol))) (point (point))) @@ -902,9 +909,11 @@ is enclosed by at least one regexp grouping construct." (set-buffer nnshimbun-buffer) (erase-buffer) (nnshimbun-retrieve-url (concat nnshimbun-url "main.htm") t) - (let ((group-header-alist (mapcar (lambda (g) (cons g nil)) nnshimbun-groups))) + (let ((case-fold-search t) + (group-header-alist (mapcar (lambda (g) (cons g nil)) nnshimbun-groups))) (dolist (group nnshimbun-groups) (let (start) + (goto-char (point-min)) (when (and (search-forward (format "\n\n" group) nil t) (setq start (point)) (search-forward (format "\n\n" group) nil t)) @@ -965,7 +974,7 @@ is enclosed by at least one regexp grouping construct." (forward-line -1) (setq i (or (ignore-errors (read (current-buffer))) 0)) (goto-char (point-max)) - (dolist (header (cdr list)) + (dolist (header (nreverse (cdr list))) (unless (nnshimbun-search-id group (mail-header-id header)) (mail-header-set-number header (setq i (1+ i))) (nnheader-insert-nov header))))))) @@ -1004,6 +1013,81 @@ is enclosed by at least one regexp grouping construct." +;;; Zdnet Japan + +(defun nnshimbun-zdnet-get-headers (group) + (save-excursion + (set-buffer nnshimbun-buffer) + (erase-buffer) + (nnshimbun-retrieve-url nnshimbun-url t) + (let ((case-fold-search t) headers) + (goto-char (point-min)) + (let (start) + (while (and (search-forward "" nil t)) + (delete-region start (point)))) + (goto-char (point-min)) + (while (re-search-forward + "" + nil t) + (let ((year (+ 2000 (string-to-number (match-string 2)))) + (month (string-to-number (match-string 3))) + (day (string-to-number (match-string 4))) + (id (format "<%s%s%s%s%%%s>" + (match-string 2) + (match-string 3) + (match-string 4) + (match-string 5) + group)) + (url (match-string 1))) + (push (make-full-mail-header + 0 + (nnshimbun-mime-encode-string + (mapconcat 'identity + (split-string + (buffer-substring + (match-end 0) + (progn (search-forward "" nil t) (point))) + "<[^>]+>") + "")) + "zdnn@softbank.co.jp" + (nnshimbun-make-date-string year month day) + id "" 0 0 (concat nnshimbun-url url)) + headers))) + (nreverse headers)))) + +(defun nnshimbun-zdnet-generate-nov-database (group) + (save-excursion + (set-buffer (nnshimbun-open-nov group)) + (let (i) + (goto-char (point-max)) + (forward-line -1) + (setq i (or (ignore-errors (read (current-buffer))) 0)) + (goto-char (point-max)) + (dolist (header (nnshimbun-zdnet-get-headers group)) + (unless (nnshimbun-search-id group (mail-header-id header)) + (mail-header-set-number header (setq i (1+ i))) + (nnheader-insert-nov header)))))) + +(defun nnshimbun-zdnet-make-contents (header) + (goto-char (point-min)) + (let (start) + (when (and (search-forward "" nil t) + (setq start (point)) + (search-forward "" nil t)) + (delete-region (point-min) start) + (delete-region (point) (point-max)) + (goto-char (point-min)) + (when (looking-at "[ \t\n]*") + (delete-region (match-beginning 0) (match-end 0)))) + (goto-char (point-min)) + (nnshimbun-insert-header header) + (insert "Content-Type: text/html; charset=ISO-2022-JP\nMIME-Version: 1.0\n\n") + (encode-coding-string (buffer-string) + (mime-charset-to-coding-system "ISO-2022-JP")))) + + (provide 'nnshimbun) ;;; nnshimbun.el ends here.