From: yamaoka <yamaoka>
Date: Fri, 15 Jun 2001 05:14:22 +0000 (+0000)
Subject: Synch with Oort Gnus.
X-Git-Tag: t-gnus-6_15_4-02-quimby-last-~29
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9860de0f38b8833b21a7f0505cd9e03b11d1e4ed;p=elisp%2Fgnus.git-

Synch with Oort Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bfa906..9bb393d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-06-14 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* nnweb.el (nnweb-google-parse-1): Fix Google content regexp.
+	(nnweb-google-wash-article): Ditto.
+
+2001-06-14 Ferenc Wagner <wferi@bolyai1.elte.hu>
+
+	* nnweb.el (nnweb-google-parse-1): Fix Google url regexp.
+
 2001-06-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* gnus.el (gnus-define-group-parameter): Don't quote the defcustom
diff --git a/lisp/nnweb.el b/lisp/nnweb.el
index 7aaa5f9..9a41a66 100644
--- a/lisp/nnweb.el
+++ b/lisp/nnweb.el
@@ -706,9 +706,11 @@ and `altavista'.")
     (goto-char (point-min))
     (re-search-forward "^<pre>" nil t)
     (narrow-to-region (point-min) (point))
-    (search-backward "</table>" nil t 2)
+    (search-backward "<table " nil t 2)
     (delete-region (point-min) (point))
-    (if (search-forward "[view thread]" nil t)
+    (if (re-search-forward "Search Result [0-9]+" nil t)
+	(replace-match ""))
+    (if (re-search-forward "View complete thread ([0-9]+ articles?)" nil t)
 	(replace-match ""))
     (goto-char (point-min))
     (while (search-forward "<br>" nil t)
@@ -739,7 +741,7 @@ and `altavista'.")
     ;; Go through all the article hits on this page.
     (goto-char (point-min))
     (while (re-search-forward
-	    "a href=/groups\\(\\?[^ \">]*seld=[0-9]+[^ \">]*\\)" nil t)
+            "a href=/groups\\(\\?[^ \">]*selm=[^ \">]*\\)" nil t)
       (setq url
 	    (concat (nnweb-definition 'address)
 		    (match-string 1)))
@@ -764,7 +766,7 @@ and `altavista'.")
 	(widen)
 	(skip-chars-forward "- \t"))
       (when (looking-at 
-	     "\\([0-9]+/[A-Za-z]+/[0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
+	     "\\([0-9]+[/ ][A-Za-z]+[/ ][0-9]+\\)[ \t]*by[ \t]*\\([^<]*\\) - <a")
 	(setq From (match-string 2)
 	      Date (match-string 1)))
       (forward-line 1)