* Makefile.in (install-package-ja): Compile and install lisp files first.

[elisp/gnus.git-] / lisp / nnultimate.el

diff --git a/lisp/nnultimate.el b/lisp/nnultimate.el
index d30c1a8..262955f 100644 (file)
--- a/lisp/nnultimate.el
+++ b/lisp/nnultimate.el
@@ -1,5 +1,5 @@
 ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system
-;; Copyright (C) 1999 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -29,6 +29,7 @@
 ;;; Code:
 
 (eval-when-compile (require 'cl))
+(eval-when-compile (require 'gnus-clfns))
 
 (require 'nnoo)
 (require 'message)
@@ -56,6 +57,8 @@
 (defvoo nnultimate-groups nil)
 (defvoo nnultimate-headers nil)
 (defvoo nnultimate-articles nil)
+(defvar nnultimate-table-regexp 
+  "postings.*editpost\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio")
 
 ;;; Interface functions
 
@@ -74,6 +77,8 @@
           (old-total (or (nth 6 entry) 1))
           (furl "forumdisplay.cgi?action=topics&number=%d&DaysPrune=1000")
           (furls (list (concat nnultimate-address (format furl sid))))
+          (nnultimate-table-regexp
+           "postings.*editpost\\|forumdisplay\\|getbio")
           headers article subject score from date lines parent point
           contents tinfo fetchers map elem a href garticles topic old-max
           inc datel table string current-page total-contents pages
@@ -82,7 +87,8 @@
       (while (and (setq article (car articles))
                  map)
        (while (and map
-                   (> article (caar map)))
+                   (or (> article (caar map))
+                       (< (cadar map) (caar map))))
          (pop map))
        (when (setq mmap (car map))
          (setq farticle -1)
@@ -124,7 +130,8 @@
                                      "-" (number-to-string current-page)
                                      (match-string 0 href))))
              (goto-char (point-min))
-             (setq contents (w3-parse-buffer (current-buffer)))
+             (setq contents
+                   (ignore-errors (w3-parse-buffer (current-buffer))))
              (setq table (nnultimate-find-forum-table contents))
              (setq string (mapconcat 'identity (nnweb-text table) ""))
              (when (string-match "topic is \\([0-9]\\) pages" string)
@@ -159,7 +166,7 @@
              (setq date (substring (car datel) (match-end 0))
                    datel nil))
            (pop datel))
-         (setq date (delete "" (split-string date "[- \n\t\r    ]")))
+         (setq date (delete "" (split-string date "[- \n\t\r \81 \81 \81 ]")))
          (if (or (member "AM" date)
                  (member "PM" date))
              (setq date (format "%s %s %s %s"
@@ -213,6 +220,10 @@
        "211 %d %d %d %s\n" (cadr elem) 1 (cadr elem)
        (prin1-to-string group))))))
 
+(deffoo nnultimate-request-close ()
+  (setq nnultimate-groups-alist nil
+       nnultimate-groups nil))
+
 (deffoo nnultimate-request-article (article &optional group server buffer)
   (nnultimate-possibly-change-server group server)
   (let ((contents (cdr (assq article nnultimate-articles))))
@@ -324,7 +335,7 @@
       ;; the group is entered, there's 2 new articles in topic one
       ;; and 1 in topic three.  Then Gnus article number 8-9 be 5-6
       ;; in topic one and 10 will be the 2 in topic three.
-      (dolist (row (reverse forum-contents))
+      (dolist (row (nreverse forum-contents))
        (setq row (nth 2 row))
        (when (setq a (nnweb-parse-find 'a row))
          (setq subject (car (last (nnweb-text a)))
@@ -337,25 +348,26 @@
                (setq art (1+ (string-to-number (car artlist)))))
              (pop artlist))
            (setq garticles art))
-         (string-match "/\\([0-9]+\\).html" href)
-         (setq topic (string-to-number (match-string 1 href)))
-         (if (setq tinfo (assq topic topics))
-             (progn
-               (setq old-max (cadr tinfo))
-               (setcar (cdr tinfo) garticles))
-           (setq old-max 0)
-           (push (list topic garticles subject href) topics)
-           (setcar (nthcdr 4 entry) topics))
-         (when (not (= old-max garticles))
-           (setq inc (- garticles old-max))
-           (setq mapping (nconc mapping
-                                (list
-                                 (list
-                                  old-total (1- (incf old-total inc))
-                                  topic (1+ old-max)))))
-           (incf old-max inc)
-           (setcar (nthcdr 5 entry) mapping)
-           (setcar (nthcdr 6 entry) old-total)))))
+         (when garticles
+           (string-match "/\\([0-9]+\\).html" href)
+           (setq topic (string-to-number (match-string 1 href)))
+           (if (setq tinfo (assq topic topics))
+               (progn
+                 (setq old-max (cadr tinfo))
+                 (setcar (cdr tinfo) garticles))
+             (setq old-max 0)
+             (push (list topic garticles subject href) topics)
+             (setcar (nthcdr 4 entry) topics))
+           (when (not (= old-max garticles))
+             (setq inc (- garticles old-max))
+             (setq mapping (nconc mapping
+                                  (list
+                                   (list
+                                    old-total (1- (incf old-total inc))
+                                    topic (1+ old-max)))))
+             (incf old-max inc)
+             (setcar (nthcdr 5 entry) mapping)
+             (setcar (nthcdr 6 entry) old-total))))))
     (setcar (nthcdr 7 entry) current-time)
     (setcar (nthcdr 1 entry) (1- old-total))
     (nnultimate-write-groups)
@@ -431,9 +443,7 @@
                     (nth 2 parse))))
     (let ((href (cdr (assq 'href (nth 1 (nnweb-parse-find 'a parse 20)))))
          case-fold-search)
-      (when (and href (string-match
-                      "postings\\|forumdisplay\\|Forum[0-9]+/HTML\\|getbio"
-                      href))
+      (when (and href (string-match nnultimate-table-regexp href))
        t))))
 
 (provide 'nnultimate)