(nnweb-gmane-create-mapping): Use the article number from

the headers when creating the mapping to avoid mismappings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86175b2..b7a9038 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnweb.el (nnweb-gmane-create-mapping): Use the article number from
+       the headers when creating the mapping to avoid mismappings. 
+
 2006-11-30  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * message.el (message-signed-or-encrypted-p): Bind mm-decrypt-option

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 00e4631..efbe118 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -480,7 +480,7 @@ Valid types include `google', `dejanews', and `gmane'.")
                    (from (mail-header-from header))
                    (subject (mail-header-subject header))
                    (rfc2047-encoding-type 'mime))
-               (when (string-match " \\([^:]+\\):\\([0-9]+\\)" xref)
+               (when (string-match " \\([^:]+\\)[:/]\\([0-9]+\\)" xref)
                  (mail-header-set-xref
                   header
                   (format "http://article.gmane.org/%s/%s/raw"
@@ -496,11 +496,9 @@ Valid types include `google', `dejanews', and `gmane'.")
                                         (rfc2047-encode-string subject))
 
                (unless (nnweb-get-hashtb (mail-header-xref header))
-                 (push
-                  (list
-                   (incf (cdr active))
-                   header)
-                  map)
+                 (push (list (mail-header-number header) header) map)
+                 (setcdr active (max (mail-header-number header)
+                                     (cdr active)))
                  (nnweb-set-hashtb (cadar map) (car map))))))
          (forward-line 1)))
       (nnheader-message 7 "Searching Gmane...done")