2001-10-26 14:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* nnweb.el (nnweb-possibly-change-server): Create nnweb-hashtb if
	not available.
	(nnweb-request-scan): Nix nnweb-hashtb if ephemeral.
	(nnweb-type-definition): Add google as alias of dejanews.
	(nnweb-google-parse-1): Forward 1 line.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4553d13..9cc55c5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-10-26 14:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnweb.el (nnweb-possibly-change-server): Create nnweb-hashtb if
+       not available.
+       (nnweb-request-scan): Nix nnweb-hashtb if ephemeral.
+       (nnweb-type-definition): Add google as alias of dejanews.
+       (nnweb-google-parse-1): Forward 1 line.
+
 2001-10-26  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-msg.el (gnus-summary-mail-forward): Doc fix: add pointer to

diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 2446078..740b182 100644 (file)
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -55,14 +55,25 @@
 (defvoo nnweb-directory (nnheader-concat gnus-directory "nnweb/")
   "Where nnweb will save its files.")
 
-(defvoo nnweb-type 'dejanews
+(defvoo nnweb-type 'google
   "What search engine type is being used.
-Valid types include `dejanews', `dejanewsold', `reference',
+Valid types include `google', `dejanews', `dejanewsold', `reference',
 and `altavista'.")
 
 (defvar nnweb-type-definition
   '(
-    (dejanews ;; bought by google.com
+    (google
+     ;;(article . nnweb-google-wash-article)
+     ;;(id . "http://groups.google.com/groups?as_umsgid=%s")
+     (article . ignore)
+     (id . "http://groups.google.com/groups?selm=%s&output=gplain")
+     ;;(reference . nnweb-google-reference)
+     (reference . identity)
+     (map . nnweb-google-create-mapping)
+     (search . nnweb-google-search)
+     (address . "http://groups.google.com/groups")
+     (identifier . nnweb-google-identity))
+    (dejanews ;; alias of google
      ;;(article . nnweb-google-wash-article)
      ;;(id . "http://groups.google.com/groups?as_umsgid=%s")
      (article . ignore)
@@ -136,6 +147,8 @@ and `altavista'.")
 
 (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)
@@ -305,10 +318,11 @@ and `altavista'.")
       (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)
-              (not (equal group nnweb-group)))
-      (setq nnweb-hashtb (gnus-make-hashtable 4095))
+              (equal group nnweb-group))
       (nnweb-request-group group nil t))))
 
 (defun nnweb-init (server)
@@ -754,7 +768,7 @@ and `altavista'.")
       (setq Subject (buffer-string))
       (goto-char (point-max))
       (widen)
-      (forward-line 2)
+      (forward-line 1)
       (when (looking-at "<br><font[^>]+>")
        (goto-char (match-end 0)))
       (if (not (looking-at "<a[^>]+>"))