Index: ChangeLog =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/ChangeLog,v retrieving revision 7.1099 diff -c -r7.1099 ChangeLog *** ChangeLog 27 Mar 2006 09:42:59 -0000 7.1099 --- ChangeLog 27 Mar 2006 16:06:35 -0000 *************** *** 1,3 **** --- 1,12 ---- + 2006-03-27 Michael Cadilhac (tiny change) + + * nnrss.el (nnrss-check-group): Hash messages with the `date' + field together with the previous criteria. Store the original + `date' field in `nnrss-group-data'. + (nnrss-read-group-data): Update accordingly. + (nnrss-retrieve-headers): Update access to `nnrss-group-data' elements. + (nnrss-request-article): Likewise. + 2006-03-26 Andreas Seltenreich (tiny change) * message.el (message-resend): Bind message-generate-hashcash to Index: nnrss.el =================================================================== RCS file: /usr/local/cvsroot/gnus/lisp/nnrss.el,v retrieving revision 7.43 diff -c -r7.43 nnrss.el *** nnrss.el 16 Jan 2006 22:57:40 -0000 7.43 --- nnrss.el 27 Mar 2006 16:06:36 -0000 *************** *** 125,131 **** (or (nth 4 e) "(nobody)") "\t" ;; date ! (or (nth 5 e) "") "\t" ;; id (format "<%d@%s.nnrss>" (car e) group) --- 125,131 ---- (or (nth 4 e) "(nobody)") "\t" ;; date ! (or (nth 6 e) "") "\t" ;; id (format "<%d@%s.nnrss>" (car e) group) *************** *** 138,149 **** "-1" "\t" ;; Xref "" "\t" ! (if (and (nth 6 e) (memq nnrss-description-field nnmail-extra-headers)) (concat (symbol-name nnrss-description-field) ": " ! (nnrss-format-string (nth 6 e)) "\t") "") (if (and (nth 2 e) --- 138,149 ---- "-1" "\t" ;; Xref "" "\t" ! (if (and (nth 7 e) (memq nnrss-description-field nnmail-extra-headers)) (concat (symbol-name nnrss-description-field) ": " ! (nnrss-format-string (nth 7 e)) "\t") "") (if (and (nth 2 e) *************** *** 198,210 **** (insert "Subject: " (nth 3 e) "\n")) (if (nth 4 e) (insert "From: " (nth 4 e) "\n")) ! (if (nth 5 e) ! (insert "Date: " (nnrss-format-string (nth 5 e)) "\n")) (let ((header (buffer-string)) ! (text (nth 6 e)) (link (nth 2 e)) ! (enclosure (nth 7 e)) ! (comments (nth 8 e)) ;; Enable encoding of Newsgroups header in XEmacs. (default-enable-multibyte-characters t) (rfc2047-header-encoding-alist --- 198,210 ---- (insert "Subject: " (nth 3 e) "\n")) (if (nth 4 e) (insert "From: " (nth 4 e) "\n")) ! (if (nth 6 e) ! (insert "Date: " (nnrss-format-string (nth 6 e)) "\n")) (let ((header (buffer-string)) ! (text (nth 7 e)) (link (nth 2 e)) ! (enclosure (nth 8 e)) ! (comments (nth 9 e)) ;; Enable encoding of Newsgroups header in XEmacs. (default-enable-multibyte-characters t) (rfc2047-header-encoding-alist *************** *** 576,582 **** (insert-file-contents file) (eval-region (point-min) (point-max)))) (dolist (e nnrss-group-data) ! (puthash (or (nth 2 e) (nth 6 e)) t nnrss-group-hashtb) (when (and (car e) (> nnrss-group-min (car e))) (setq nnrss-group-min (car e))) (when (and (car e) (< nnrss-group-max (car e))) --- 576,582 ---- (insert-file-contents file) (eval-region (point-min) (point-max)))) (dolist (e nnrss-group-data) ! (puthash (concat (nth 5 e) (or (nth 2 e) (nth 7 e))) t nnrss-group-hashtb) (when (and (car e) (> nnrss-group-min (car e))) (setq nnrss-group-min (car e))) (when (and (car e) (< nnrss-group-max (car e))) *************** *** 657,663 **** ;;; Snarf functions (defun nnrss-check-group (group server) ! (let (file xml subject url extra changed author date feed-subject enclosure comments rss-ns rdf-ns content-ns dc-ns) (if (and nnrss-use-local (file-exists-p (setq file (expand-file-name --- 657,663 ---- ;;; Snarf functions (defun nnrss-check-group (group server) ! (let (file xml subject url extra changed author date-field date feed-subject enclosure comments rss-ns rdf-ns content-ns dc-ns) (if (and nnrss-use-local (file-exists-p (setq file (expand-file-name *************** *** 690,701 **** (dolist (item (nreverse (nnrss-find-el (intern (concat rss-ns "item")) xml))) (when (and (listp item) (string= (concat rss-ns "item") (car item)) ! (if (setq url (nnrss-decode-entities-string ! (nnrss-node-text rss-ns 'link (cddr item)))) ! (not (gethash url nnrss-group-hashtb)) ! (setq extra (or (nnrss-node-text content-ns 'encoded item) ! (nnrss-node-text rss-ns 'description item))) ! (not (gethash extra nnrss-group-hashtb)))) (setq subject (nnrss-node-text rss-ns 'title item)) (setq extra (or extra (nnrss-node-text content-ns 'encoded item) --- 690,705 ---- (dolist (item (nreverse (nnrss-find-el (intern (concat rss-ns "item")) xml))) (when (and (listp item) (string= (concat rss-ns "item") (car item)) ! (progn ! (setq date-field (or (nnrss-node-text dc-ns 'date item) ! (nnrss-node-text rss-ns 'pubDate item) ! "")) ! (if (setq url (nnrss-decode-entities-string ! (nnrss-node-text rss-ns 'link (cddr item)))) ! (not (gethash (concat date-field url) nnrss-group-hashtb)) ! (setq extra (or (nnrss-node-text content-ns 'encoded item) ! (nnrss-node-text rss-ns 'description item))) ! (not (gethash (concat date-field extra) nnrss-group-hashtb))))) (setq subject (nnrss-node-text rss-ns 'title item)) (setq extra (or extra (nnrss-node-text content-ns 'encoded item) *************** *** 705,713 **** (setq author (or (nnrss-node-text rss-ns 'author item) (nnrss-node-text dc-ns 'creator item) (nnrss-node-text dc-ns 'contributor item))) ! (setq date (nnrss-normalize-date ! (or (nnrss-node-text dc-ns 'date item) ! (nnrss-node-text rss-ns 'pubDate item)))) (setq comments (nnrss-node-text rss-ns 'comments item)) (when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item))) (let ((url (cdr (assq 'url enclosure))) --- 709,715 ---- (setq author (or (nnrss-node-text rss-ns 'author item) (nnrss-node-text dc-ns 'creator item) (nnrss-node-text dc-ns 'contributor item))) ! (setq date (nnrss-normalize-date date-field)) (setq comments (nnrss-node-text rss-ns 'comments item)) (when (setq enclosure (cadr (assq (intern (concat rss-ns "enclosure")) item))) (let ((url (cdr (assq 'url enclosure))) *************** *** 737,748 **** url (and subject (nnrss-mime-encode-string subject)) (and author (nnrss-mime-encode-string author)) date (and extra (nnrss-decode-entities-string extra)) enclosure comments) nnrss-group-data) ! (puthash (or url extra) t nnrss-group-hashtb) (setq changed t)) (setq extra nil)) (when changed --- 739,751 ---- url (and subject (nnrss-mime-encode-string subject)) (and author (nnrss-mime-encode-string author)) + date-field date (and extra (nnrss-decode-entities-string extra)) enclosure comments) nnrss-group-data) ! (puthash (concat date-field (or url extra)) t nnrss-group-hashtb) (setq changed t)) (setq extra nil)) (when changed