This commit was generated by cvs2svn to compensate for changes in r6137,

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

diff --git a/lisp/gnus-gl.el b/lisp/gnus-gl.el
index 1df6838..de68a6d 100644 (file)
--- a/lisp/gnus-gl.el
+++ b/lisp/gnus-gl.el
@@ -1,7 +1,5 @@
 ;;; gnus-gl.el --- an interface to GroupLens for Gnus
-
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-;;     Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Brad Miller <bmiller@cs.umn.edu>
 ;; Keywords: news, score
@@ -131,7 +129,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (defvar gnus-summary-grouplens-line-format
-  "%U\%R\%z%l%I\%(%[%4L: %-23,23n%]%) %s\n"
+  "%U\%R\%z%l%I\%(%[%4L: %-20,20n%]%) %s\n"
   "*The line format spec in summary GroupLens mode buffers.")
 
 (defvar grouplens-pseudonym ""
@@ -139,10 +137,10 @@
 This pseudonym is obtained during the registration process")
 
 (defvar grouplens-bbb-host "grouplens.cs.umn.edu"
-  "Host where the bbbd is running.")
+  "Host where the bbbd is running" )
 
 (defvar grouplens-bbb-port 9000
-  "Port where the bbbd is listening.")
+  "Port where the bbbd is listening" )
 
 (defvar grouplens-newsgroups
   '("comp.groupware" "comp.human-factors" "comp.lang.c++"
@@ -196,19 +194,19 @@ GroupLens scores can be combined with gnus scores in one of three ways.
 ;;;; Program global variables
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (defvar grouplens-bbb-token nil
-  "Current session token number.")
+  "Current session token number")
 
 (defvar grouplens-bbb-process nil
-  "Process Id of current bbbd network stream process.")
+  "Process Id of current bbbd network stream process")
 
 (defvar grouplens-bbb-buffer nil
-  "Buffer associated with the BBBD process.")
+  "Buffer associated with the BBBD process")
 
 (defvar grouplens-rating-alist nil
-  "Current set of  message-id rating pairs.")
+  "Current set of  message-id rating pairs")
 
 (defvar grouplens-current-hashtable nil
-  "A hashtable to hold predictions from the BBB.")
+  "A hashtable to hold predictions from the BBB")
 
 (defvar grouplens-current-group nil)
 
@@ -259,7 +257,8 @@ If this times out we give up and assume that something has died..." )
   (catch 'done
     (condition-case error
        (setq grouplens-bbb-process
-             (open-network-stream "BBBD" grouplens-bbb-buffer host port))
+             (open-network-stream-as-binary
+              "BBBD" grouplens-bbb-buffer host port))
       (error (gnus-message 3 "Error: Failed to connect to BBB")
             nil))
     (and (null grouplens-bbb-process)
@@ -314,7 +313,7 @@ If this times out we give up and assume that something has died..." )
                                (concat "login " grouplens-pseudonym))
              (if (bbb-read-response bbb-process)
                  (setq grouplens-bbb-token (bbb-extract-token-number))
-               (gnus-message 3 "Error: GroupLens login failed")))))
+             (gnus-message 3 "Error: GroupLens login failed")))))
     (gnus-message 3 "Error: you must set a pseudonym"))
   grouplens-bbb-token)
 
@@ -342,7 +341,7 @@ If this times out we give up and assume that something has died..." )
 
 (defun bbb-build-mid-scores-alist (groupname)
   "this function can be called as part of the function to return the list of score files to use.
-See the gnus variable `gnus-score-find-score-files-function'.
+See the gnus variable gnus-score-find-score-files-function.
 
 *Note:*  If you want to use grouplens scores along with calculated scores,
 you should see the offset and scale variables.  At this point, I don't
@@ -408,7 +407,7 @@ recommend using both scores and grouplens predictions together."
                pred (bbb-get-pred))
          (push `(,mid ,pred nil s) resp)
          (gnus-sethash mid (list pred (bbb-get-confl) (bbb-get-confh))
-                       grouplens-current-hashtable)
+                     grouplens-current-hashtable)
          (forward-line 1)
          t)
         ((looking-at "\\(<.*>\\) :pred=\\([0-9]\.[0-9][0-9]\\)")
@@ -510,11 +509,11 @@ recommend using both scores and grouplens predictions together."
       ;; Return an empty string
       ""
     (let* ((rate-string (make-string 12 ?\ ))
-          (mid (mail-header-id header))
-          (hashent (gnus-gethash mid grouplens-current-hashtable))
-          (pred (or (nth 0 hashent) 0))
-          (low (nth 1 hashent))
-          (high (nth 2 hashent)))
+           (mid (mail-header-id header))
+           (hashent (gnus-gethash mid grouplens-current-hashtable))
+           (pred (or (nth 0 hashent) 0))
+           (low (nth 1 hashent))
+           (high (nth 2 hashent)))
       ;; Init rate-string
       (aset rate-string 0 ?|)
       (aset rate-string 11 ?|)
@@ -632,10 +631,10 @@ recommend using both scores and grouplens predictions together."
 
 (defun bbb-build-rate-command (rate-alist)
   (concat "putratings " grouplens-bbb-token " " grouplens-current-group " \r\n"
-         (mapconcat (lambda (this)     ; form (mid . (score . time))
-                      (concat (car this)
-                              " :rating=" (cadr this) ".00"
-                              " :time=" (cddr this)))
+         (mapconcat '(lambda (this)    ; form (mid . (score . time))
+                       (concat (car this)
+                               " :rating=" (cadr this) ".00"
+                               " :time=" (cddr this)))
                     rate-alist "\r\n")
          "\r\n.\r\n"))
 
@@ -767,7 +766,7 @@ If prefix argument ALL is non-nil, all articles are marked as read."
 (defun gnus-gl-get-trace ()
   "Insert the contents of the BBBD trace buffer."
   (when grouplens-bbb-buffer
-    (insert-buffer-substring grouplens-bbb-buffer)))
+    (insert-buffer grouplens-bbb-buffer)))
 
 ;;
 ;; GroupLens minor mode
@@ -781,12 +780,12 @@ If prefix argument ALL is non-nil, all articles are marked as read."
 (unless gnus-grouplens-mode-map
   (setq gnus-grouplens-mode-map (make-keymap))
   (gnus-define-keys
-      gnus-grouplens-mode-map
-    "n" grouplens-next-unread-article
-    "r" bbb-summary-rate-article
-    "k" grouplens-score-thread
-    "c" grouplens-summary-catchup-and-exit
-    "," grouplens-best-unread-article))
+   gnus-grouplens-mode-map
+   "n" grouplens-next-unread-article
+   "r" bbb-summary-rate-article
+   "k" grouplens-score-thread
+   "c" grouplens-summary-catchup-and-exit
+   "," grouplens-best-unread-article))
 
 (defun gnus-grouplens-make-menu-bar ()
   (unless (boundp 'gnus-grouplens-menu)
@@ -810,9 +809,9 @@ If prefix argument ALL is non-nil, all articles are marked as read."
          (if (null arg) (not gnus-grouplens-mode)
            (> (prefix-numeric-value arg) 0)))
     (when gnus-grouplens-mode
-      (gnus-make-local-hook 'gnus-select-article-hook)
+      (make-local-hook 'gnus-select-article-hook)
       (add-hook 'gnus-select-article-hook 'grouplens-do-time nil 'local)
-      (gnus-make-local-hook 'gnus-exit-group-hook)
+      (make-local-hook 'gnus-exit-group-hook)
       (add-hook 'gnus-exit-group-hook 'bbb-exit-group nil 'local)
       (make-local-variable 'gnus-score-find-score-files-function)