Re: nnweb fix

[Andreas Seltenreich <andreas+ding@gate450.dyndns.org>]

[-- Attachment #1: Type: text/plain, Size: 1182 bytes --]

Reiner Steib writes:

> On Fri, Jan 27 2006, Andreas Seltenreich wrote:
>> While it works for ephemeral groups, solid ones seem still broken.
>>
>> ISTM this broke solid groups back in 2003:
>> <http://quimby.gnus.org/cgi-bin/cvsweb.cgi/gnus/lisp/gnus-group.el.diff?r1=6.95&r2=6.96>
>>
>> I guess the solution is to adapt nnweb to use the server variables
>> instead of those custom args to nnweb-request-create-group for solid
>> groups?
>
> Could you suggest a patch, please?

How about the one attached?

2006-01-31  Andreas Seltenreich <uwi7@stud.uni-karlsruhe.de>

	* nnweb.el (nnweb-group-alist): Use defvar instead of defvoo, there's
	only one active file for all servers.
	(nnweb-request-scan): Make sure nnweb-articles is initialized on solid
	groups -- Gnus might have used a FAST request to select the group.
	(nnweb-request-group, nnweb-google-parse-1): nnweb-type and
	nnweb-search are no longer redundantly kept in the active file.
	(nnweb-request-list): Don't list bogus groups.  There can only be one.
	(nnweb-request-create-group): ARGS is no longer used.
	(nnweb-possibly-change-server, nnweb-request-group): Some
	initialisation removed -- let nnoo do the work.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: nnweb.patch --]
[-- Type: text/x-patch, Size: 5947 bytes --]

Index: lisp/nnweb.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/nnweb.el,v
retrieving revision 7.12
diff -c -r7.12 nnweb.el
*** lisp/nnweb.el	30 Jan 2006 14:55:15 -0000	7.12
--- lisp/nnweb.el	31 Jan 2006 05:43:57 -0000
***************
*** 1,7 ****
  ;;; nnweb.el --- retrieving articles via web search engines
  
  ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
! ;;   2004, 2005 Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
  ;; Keywords: news
--- 1,7 ----
  ;;; nnweb.el --- retrieving articles via web search engines
  
  ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
! ;;   2004, 2005, 2006 Free Software Foundation, Inc.
  
  ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
  ;; Keywords: news
***************
*** 30,39 ****
  ;; FIXME: Due to changes in the HTML output of Gmane, stuff related to Gmane
  ;; web groups (`gnus-group-make-web-group') doesn't work anymore.
  
- ;; FIXME: Solid web groups are currently broken because ARGS are no longer
- ;; passed from `gnus-group-make-web-group' to `nnweb-request-create-group'.
- ;; See revision 6.96 of `gnus-group.el' (2003-01-06).
- 
  ;;; Code:
  
  (eval-when-compile (require 'cl))
--- 30,35 ----
***************
*** 103,109 ****
  
  (defvoo nnweb-articles nil)
  (defvoo nnweb-buffer nil)
! (defvoo nnweb-group-alist nil)
  (defvoo nnweb-group nil)
  (defvoo nnweb-hashtb nil)
  
--- 99,105 ----
  
  (defvoo nnweb-articles nil)
  (defvoo nnweb-buffer nil)
! (defvar nnweb-group-alist nil)
  (defvoo nnweb-group nil)
  (defvoo nnweb-hashtb nil)
  
***************
*** 126,150 ****
  (deffoo nnweb-request-scan (&optional group server)
    (nnweb-possibly-change-server group server)
    (if nnweb-ephemeral-p
!       (setq nnweb-hashtb (gnus-make-hashtable 4095)))
    (funcall (nnweb-definition 'map))
    (unless nnweb-ephemeral-p
      (nnweb-write-active)
      (nnweb-write-overview group)))
  
  (deffoo nnweb-request-group (group &optional server dont-check)
!   (nnweb-possibly-change-server nil server)
!   (when (and group
! 	     (not (equal group nnweb-group))
! 	     (not nnweb-ephemeral-p))
!     (setq nnweb-group group
! 	  nnweb-articles nil)
!     (let ((info (assoc group nnweb-group-alist)))
!       (when info
! 	(setq nnweb-type (nth 2 info))
! 	(setq nnweb-search (nth 3 info))
! 	(unless dont-check
! 	  (nnweb-read-overview group)))))
    (cond
     ((not nnweb-articles)
      (nnheader-report 'nnweb "No matching articles"))
--- 122,140 ----
  (deffoo nnweb-request-scan (&optional group server)
    (nnweb-possibly-change-server group server)
    (if nnweb-ephemeral-p
!       (setq nnweb-hashtb (gnus-make-hashtable 4095))
!     (unless nnweb-articles
!       (nnweb-read-overview group)))
    (funcall (nnweb-definition 'map))
    (unless nnweb-ephemeral-p
      (nnweb-write-active)
      (nnweb-write-overview group)))
  
  (deffoo nnweb-request-group (group &optional server dont-check)
!   (nnweb-possibly-change-server group server)
!   (unless (or nnweb-ephemeral-p
! 	      dont-check)
!     (nnweb-read-overview group))
    (cond
     ((not nnweb-articles)
      (nnheader-report 'nnweb "No matching articles"))
***************
*** 208,214 ****
    (nnweb-possibly-change-server nil server)
    (save-excursion
      (set-buffer nntp-server-buffer)
!     (nnmail-generate-active nnweb-group-alist)
      t))
  
  (deffoo nnweb-request-update-info (group info &optional server)
--- 198,204 ----
    (nnweb-possibly-change-server nil server)
    (save-excursion
      (set-buffer nntp-server-buffer)
!     (nnmail-generate-active (list (assoc server nnweb-group-alist)))
      t))
  
  (deffoo nnweb-request-update-info (group info &optional server)
***************
*** 220,226 ****
  (deffoo nnweb-request-create-group (group &optional server args)
    (nnweb-possibly-change-server nil server)
    (nnweb-request-delete-group group)
!   (push `(,group ,(cons 1 0) ,@args) nnweb-group-alist)
    (nnweb-write-active)
    t)
  
--- 210,216 ----
  (deffoo nnweb-request-create-group (group &optional server args)
    (nnweb-possibly-change-server nil server)
    (nnweb-request-delete-group group)
!   (push `(,group ,(cons 1 0)) nnweb-group-alist)
    (nnweb-write-active)
    t)
  
***************
*** 290,307 ****
      def))
  
  (defun nnweb-possibly-change-server (&optional group server)
-   (nnweb-init server)
    (when server
      (unless (nnweb-server-opened server)
!       (nnweb-open-server server)))
    (unless nnweb-group-alist
      (nnweb-read-active))
    (unless nnweb-hashtb
      (setq nnweb-hashtb (gnus-make-hashtable 4095)))
    (when group
!     (when (and (not nnweb-ephemeral-p)
! 	       (equal group nnweb-group))
!       (nnweb-request-group group nil t))))
  
  (defun nnweb-init (server)
    "Initialize buffers and such."
--- 280,295 ----
      def))
  
  (defun nnweb-possibly-change-server (&optional group server)
    (when server
      (unless (nnweb-server-opened server)
!       (nnweb-open-server server))
!     (nnweb-init server))
    (unless nnweb-group-alist
      (nnweb-read-active))
    (unless nnweb-hashtb
      (setq nnweb-hashtb (gnus-make-hashtable 4095)))
    (when group
!     (setq nnweb-group group)))
  
  (defun nnweb-init (server)
    "Initialize buffers and such."
***************
*** 347,354 ****
  	Subject Score Date Newsgroups From
  	map url mid)
      (unless active
!       (push (list nnweb-group (setq active (cons 1 0))
! 		  nnweb-type nnweb-search)
  	    nnweb-group-alist))
      ;; Go through all the article hits on this page.
      (goto-char (point-min))
--- 335,341 ----
  	Subject Score Date Newsgroups From
  	map url mid)
      (unless active
!       (push (list nnweb-group (setq active (cons 1 0)))
  	    nnweb-group-alist))
      ;; Go through all the article hits on this page.
      (goto-char (point-min))