* nnslashdot.el (nnslashdot-request-list): Use the new slashdot

format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83de8a2..1b36dda 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-03-20 00:12:42  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnslashdot.el (nnslashdot-request-list): Use the new slashdot
+       format. 
+
 2000-03-16  Simon Josefsson  <jas@pdc.kth.se>
 
        * imap.el: GSSAPI support, support kerberos 4 with Cyrus v1.6.x

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 23dae0d..72d83dd 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -377,10 +377,11 @@
              (narrow-to-region (point) (search-forward "</story>"))
              (goto-char (point-min))
              (re-search-forward "<title>\\([^<]+\\)</title>")
-             (setq description (nnweb-decode-entities-string (match-string 1)))
+             (setq description
+                   (nnweb-decode-entities-string (match-string 1)))
              (re-search-forward "<url>\\([^<]+\\)</url>")
              (setq sid (match-string 1))
-             (string-match "/\\([0-9/]+\\).shtml" sid)
+             (string-match "/\\([0-9/]+\\)\\(.shtml\\|$\\)" sid)
              (setq sid (match-string 1 sid))
              (re-search-forward "<comments>\\([^<]+\\)</comments>")
              (setq articles (string-to-number (match-string 1)))
@@ -397,9 +398,11 @@
                (nnweb-insert (format nnslashdot-active-url number) t)
                (goto-char (point-min))
                (while (re-search-forward
-                       "article.pl\\?sid=\\([^&]+\\).*<b>\\([^<]+\\)</b>" nil t)
+                       "article.pl\\?sid=\\([^&]+\\).*<b>\\([^<]+\\)</b>"
+                       nil t)
                  (setq sid (match-string 1)
-                       description (nnweb-decode-entities-string (match-string 2)))
+                       description
+                       (nnweb-decode-entities-string (match-string 2)))
                  (forward-line 1)
                  (when (re-search-forward "<b>\\([0-9]+\\)</b>" nil t)
                    (setq articles (string-to-number (match-string 1))))