;;; nnslashdot.el --- interfacing with Slashdot
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
(let ((case-fold-search t))
(erase-buffer)
(when (= start 1)
- (nnweb-insert (format nnslashdot-article-url sid) t)
+ (nnweb-insert (format nnslashdot-article-url
+ (nnslashdot-sid-strip sid)) t)
(goto-char (point-min))
(search-forward "Posted by ")
(when (looking-at "<a[^>]+>\\([^<]+\\)")
(forward-line 2)
(setq lines (count-lines
(point)
- (search-forward
- "A href=http://slashdot.org/article" nil t)))
+ (re-search-forward
+ "A href=\"\\(http://slashdot.org\\)?/article" nil t)))
(push
(cons
1
(make-full-mail-header
- 1 group from date (concat "<" sid "%1@slashdot>")
+ 1 group from date
+ (concat "<" (nnslashdot-sid-strip sid) "%1@slashdot>")
"" 0 lines nil nil))
headers))
(while (and (setq start (pop startats))
(< start last))
(setq point (goto-char (point-max)))
(nnweb-insert
- (format nnslashdot-comments-url sid nnslashdot-threshold 0 start)
+ (format nnslashdot-comments-url
+ (nnslashdot-sid-strip sid)
+ nnslashdot-threshold 0 start)
t)
(when first-comments
(setq first-comments nil)
(setq lines (/ (abs (- (search-forward "<td ")
(search-forward "</td>")))
70))
- (forward-line 2)
+ (forward-line 4)
(setq parent
(if (looking-at ".*cid=\\([0-9]+\\)")
(match-string 1)
(1+ article)
(concat subject " (" score ")")
from date
- (concat "<" sid "%"
+ (concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ article))
"@slashdot>")
(if parent
- (concat "<" sid "%"
+ (concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ (string-to-number parent)))
"@slashdot>")
"")
(set-buffer nnslashdot-buffer)
(erase-buffer)
(when (= start 1)
- (nnweb-insert (format nnslashdot-article-url sid) t)
+ (nnweb-insert (format nnslashdot-article-url
+ (nnslashdot-sid-strip sid)) t)
(goto-char (point-min))
(search-forward "Posted by ")
(when (looking-at "<a[^>]+>\\([^<]+\\)")
(buffer-substring (point) (1- (search-forward "<")))))
(forward-line 2)
(setq lines (count-lines (point)
- (search-forward
- "A href=http://slashdot.org/article")))
+ (re-search-forward
+ "A href=\"\\(http://slashdot.org\\)?/article")))
(push
(cons
1
(make-full-mail-header
- 1 group from date (concat "<" sid "%1@slashdot>")
+ 1 group from date (concat "<" (nnslashdot-sid-strip sid)
+ "%1@slashdot>")
"" 0 lines nil nil))
headers))
(while (or (not article)
(setq start (1+ article)))
(setq point (goto-char (point-max)))
(nnweb-insert
- (format nnslashdot-comments-url sid nnslashdot-threshold 4 start)
+ (format nnslashdot-comments-url (nnslashdot-sid-strip sid)
+ nnslashdot-threshold 4 start)
t)
(goto-char point)
(while (re-search-forward
(make-full-mail-header
(1+ article) (concat subject " (" score ")")
from date
- (concat "<" sid "%"
+ (concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ article))
"@slashdot>")
(if parent
- (concat "<" sid "%"
+ (concat "<" (nnslashdot-sid-strip sid) "%"
(number-to-string (1+ (string-to-number parent)))
"@slashdot>")
"")
(point)
(progn
(re-search-forward
- "<p>.*A href=http://slashdot\\.org/article")
+ "<p>.*A href=\"\\(http://slashdot.org\\)?/article")
(match-beginning 0)))))
(search-forward (format "<a name=\"%d\">" (1- article)))
(setq contents
(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)
- (setq sid (match-string 1 sid))
+ (string-match "/\\([0-9/]+\\)\\(.shtml\\|$\\)" sid)
+ (setq sid (concat "00/" (match-string 1 sid)))
(re-search-forward "<comments>\\([^<]+\\)</comments>")
(setq articles (string-to-number (match-string 1)))
(setq gname (concat description " (" sid ")"))
(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))))
(deffoo nnslashdot-request-post (&optional server)
(nnslashdot-possibly-change-server nil server)
- (let ((sid (message-fetch-field "newsgroups"))
+ (let ((sid (nnslashdot-sid-strip (message-fetch-field "newsgroups")))
(subject (message-fetch-field "subject"))
(references (car (last (split-string
(message-fetch-field "references")))))
(defun nnslashdot-lose (why)
(error "Slashdot HTML has changed; please get a new version of nnslashdot"))
+(defun nnslashdot-sid-strip (sid)
+ (if (string-match "^00/" sid)
+ (substring sid (match-end 0))
+ sid))
+
(provide 'nnslashdot)
;;; nnslashdot.el ends here