2001-08-19 Simon Josefsson <jas@extundo.com>

[gnus] / lisp / nnslashdot.el

diff --git a/lisp/nnslashdot.el b/lisp/nnslashdot.el
index 7fe58cb..6377e37 100644 (file)
--- a/lisp/nnslashdot.el
+++ b/lisp/nnslashdot.el
@@ -89,9 +89,9 @@
   (nnslashdot-possibly-change-server group server)
   (condition-case why
       (unless gnus-nov-is-evil
-        (if nnslashdot-threaded
-            (nnslashdot-threaded-retrieve-headers articles group)
-          (nnslashdot-sane-retrieve-headers articles group)))
+       (if nnslashdot-threaded
+           (nnslashdot-threaded-retrieve-headers articles group)
+         (nnslashdot-sane-retrieve-headers articles group)))
     (search-failed (nnslashdot-lose why))))
 
 (deffoo nnslashdot-threaded-retrieve-headers (articles group)
@@ -110,8 +110,8 @@
          (nnweb-insert (format nnslashdot-article-url
                                (nnslashdot-sid-strip sid)) t)
          (goto-char (point-min))
-         (search-forward "Posted by ")
-         (when (looking-at "<a[^>]+>\\([^<]+\\)")
+         (re-search-forward "Posted by[ \t\r\n]+")
+         (when (looking-at "<a[^>]+>[ \t\r\n]*\\([^<\r\n]+\\)")
            (setq from (nnweb-decode-entities-string (match-string 1))))
          (search-forward " on ")
          (setq date (nnslashdot-date-to-date
@@ -152,7 +152,7 @@
                  score (match-string 5))
            (when (string-match "^Re: *" subject)
              (setq subject (concat "Re: " (substring subject (match-end 0)))))
-            (setq subject (nnweb-decode-entities-string subject))
+           (setq subject (nnweb-decode-entities-string subject))
            (forward-line 1)
            (if (looking-at
                 "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
@@ -217,8 +217,8 @@
        (nnweb-insert (format nnslashdot-article-url
                              (nnslashdot-sid-strip sid)) t)
        (goto-char (point-min))
-       (search-forward "Posted by ")
-       (when (looking-at "<a[^>]+>\\([^<]+\\)")
+       (re-search-forward "Posted by[ \t\r\n]+")
+       (when (looking-at "<a[^>]+>[ \t\n\r]*\\([^<\r\n]+\\)")
          (setq from (nnweb-decode-entities-string (match-string 1))))
        (search-forward " on ")
        (setq date (nnslashdot-date-to-date
@@ -226,7 +226,7 @@
        (forward-line 2)
        (setq lines (count-lines (point)
                                 (re-search-forward
-                                 "A href=\"\\(http://slashdot.org\\)?/article")))
+                                 "&lt;&nbsp; <A href=\"\\(http://slashdot.org\\)?/article")))
        (push
         (cons
          1
@@ -254,7 +254,7 @@
                score (match-string 5))
          (when (string-match "^Re: *" subject)
            (setq subject (concat "Re: " (substring subject (match-end 0)))))
-          (setq subject (nnweb-decode-entities-string subject))
+         (setq subject (nnweb-decode-entities-string subject))
          (forward-line 1)
          (if (looking-at
               "by <a[^>]+>\\([^<]+\\)</a>[ \t\n]*.*(\\([^)]+\\))")
@@ -340,14 +340,15 @@
            (when (numberp article)
              (if (= article 1)
                  (progn
-                   (re-search-forward "Posted by *<[^>]+>[^>]*<[^>]+> *on ")
+                   (re-search-forward 
+                    "Posted by[ \t\r\n]+<[^>]+>[ \t\r\n]*[^>]*[ \t\r\n]*<[^>]+> *[ \t\r\n]*on ")
                    (search-forward "<BR>")
                    (setq contents
                          (buffer-substring
                           (point)
                           (progn
                             (re-search-forward
-                             "<p>.*A href=\"\\(http://slashdot.org\\)?/article")
+                             "&lt;&nbsp;[ \t\r\n]*<A HREF=\"\\(\\(http:\\)?//slashdot\\.org\\)?/article")
                             (match-beginning 0)))))
                (search-forward (format "<a name=\"%d\">" (1- article)))
                (setq contents
@@ -387,7 +388,7 @@
   (let ((number 0)
        sid elem description articles gname)
     (condition-case why
-        ;; First we do the Ultramode to get info on all the latest groups.
+       ;; First we do the Ultramode to get info on all the latest groups.
        (progn
          (mm-with-unibyte-buffer
            (nnweb-insert nnslashdot-backslash-url t)
@@ -407,7 +408,7 @@
              (setq gname (concat description " (" sid ")"))
              (if (setq elem (assoc gname nnslashdot-groups))
                  (setcar (cdr elem) articles)
-               (push (list gname articles sid (current-time)) 
+               (push (list gname articles sid (current-time))
                      nnslashdot-groups))
              (goto-char (point-max))
              (widen)))
@@ -429,7 +430,7 @@
                  (setq gname (concat description " (" sid ")"))
                  (if (setq elem (assoc gname nnslashdot-groups))
                      (setcar (cdr elem) articles)
-                   (push (list gname articles sid (current-time)) 
+                   (push (list gname articles sid (current-time))
                          nnslashdot-groups)))))
            (incf number 30)))
       (search-failed (nnslashdot-lose why)))
@@ -508,9 +509,9 @@
     (when item
       (if (fourth item)
          (when (and (>= (length articles) (cadr item)) ;; All are expirable.
-                    (nnmail-expired-article-p 
+                    (nnmail-expired-article-p
                      group
-                     (fourth item) 
+                     (fourth item)
                      force))
            (setq nnslashdot-groups (delq item nnslashdot-groups))
            (nnslashdot-write-groups)
@@ -551,7 +552,8 @@
     (setq nnslashdot-buffer
          (save-excursion
            (nnheader-set-temp-buffer
-            (format " *nnslashdot %s*" server))))))
+            (format " *nnslashdot %s*" server))))
+    (push nnslashdot-buffer gnus-buffers)))
 
 (defun nnslashdot-date-to-date (sdate)
   (condition-case err
@@ -575,11 +577,6 @@
 (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))
-
 (defalias 'nnslashdot-sid-strip 'identity)
 
 (provide 'nnslashdot)