;;; 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.
+;; 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
(goto-char (point-max))
(widen)
(narrow-to-region (point)
- (search-forward "</td" nil t))
+ (search-forward "</table" nil t))
(mm-url-remove-markup)
(mm-url-decode-entities)
- (search-backward " - ")
- (when (looking-at
- "\\W+\\(\\w+\\) \\([0-9]+\\)\\(?: \\([0-9]\\{4\\}\\)\\)?")
- (setq Date (format "%s %s 00:00:00 %s"
- (match-string 1)
- (match-string 2)
- (or (match-string 3)
- (substring (current-time-string) -4))))
- (goto-char (match-end 0)))
- (when (looking-at "[^b]+by\\W+\\([^<\n]+\\)")
- (setq From (match-string 1)))
+ (goto-char (point-max))
+ (when
+ (re-search-backward
+ "^\\(?:\\(\\w+\\) \\([0-9]+\\)\\|\\S-+\\)\\(?: \\([0-9]\\{4\\}\\)\\)? by ?\\(.*\\)"
+ nil t)
+ (setq Date (if (match-string 1)
+ (format "%s %s 00:00:00 %s"
+ (match-string 1)
+ (match-string 2)
+ (or (match-string 3)
+ (substring (current-time-string) -4)))
+ (current-time-string)))
+ (setq From (match-string 4)))
(widen)
- (forward-line 1)
(incf i)
(unless (nnweb-get-hashtb url)
(push
(mm-url-encode-www-form-urlencoded
`(("query" . ,search)
("HITSPERPAGE" . ,(number-to-string nnweb-max-hits))
- ;;("TOPDOC" . "500")
+ ;;("TOPDOC" . "1000")
))))
(setq buffer-file-name nil)
(set-buffer-multibyte t)