Updated sb-zeit-de.el

[David Engster <deng@xxxxxxxxxxxxxxx>]

Dear maintainers,

attached is a patch for the zeit-de shimbun. It contains an updated
group list and a few other small changes.

Regards,
David

Index: ChangeLog
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/shimbun/ChangeLog,v
retrieving revision 1.216
diff -u -r1.216 ChangeLog
--- ChangeLog	9 Oct 2009 10:57:23 -0000	1.216
+++ ChangeLog	13 Oct 2009 12:35:21 -0000
@@ -1,3 +1,10 @@
+2009-10-13  David Engster  <dengste@xxxxxx>
+
+	* sb-zeit-de.el (shimbun-zeit-de-groups): Updated group list.
+	(shimbun-zeit-de-content-end): Updated regexp.
+	(shimbun-make-contents): Follow window.location URL.
+	(shimbun-clear-contents): Added new tag for removal.
+
 2008-10-09  Katsumi Yamaoka  <yamaoka@xxxxxxx>
 
 	* sb-kantei.el (shimbun-clear-contents): Remove useless tags.
Index: sb-zeit-de.el
===================================================================
RCS file: /storage/cvsroot/emacs-w3m/shimbun/sb-zeit-de.el,v
retrieving revision 1.15
diff -u -r1.15 sb-zeit-de.el
--- sb-zeit-de.el	1 Jul 2008 01:04:35 -0000	1.15
+++ sb-zeit-de.el	13 Oct 2009 12:35:21 -0000
@@ -36,9 +36,9 @@
 (luna-define-class shimbun-zeit-de (shimbun-rss) ())
 
 (defvar shimbun-zeit-de-groups
-  '("auto" "computer" "deutschland" "feuilleton" "gesundheit"
-    "international" "leben" "literatur" "musik" "news" "reisen"
-    "schule" "sport" "studium" "wirtschaft" "wissen" "zuender"))
+  '("politik" "wirtschaft" "meinung" "gesellschaft" "kultur"
+    "wissen" "digital" "studium" "karriere" "lebensart" "reisen"
+    "auto" "sport" "blogs" "news"))
 
 (defvar shimbun-zeit-de-x-face-alist
   '(("default" . "X-Face: +@u:6eD3Nq>u{P_Ev&\"A6eW=EA{5H[OqH;|oz7H>atafNFsUS-&7\
@@ -51,7 +51,8 @@
   (concat
    "</body>\\|</html>\\|navigation[^><]*>[^A]\\|"
    "<script language=\"JavaScript1\.2\" type=\"text/javascript\">\\|"
-   "<div[^>]+\\(class\\|id\\)=\"comments"))
+   "<div[^>]+\\(class\\|id\\)=\"comments\\|<li class=\"bookmarks\\\|"
+   "class=\"com\"\\|class=\"toolad\""))
 
 (defvar shimbun-zeit-de-from-address "DieZeit@xxxxxxx")
 
@@ -79,6 +80,10 @@
 
 (luna-define-method shimbun-make-contents :before ((shimbun shimbun-zeit-de)
 						   header)
+  (when (re-search-forward "<script.*window.location='\\(.+?\\)';" nil t)
+    (let ((url (match-string 1)))
+      (erase-buffer)
+      (shimbun-retrieve-url (concat url "?page=all"))))
   (let* ((case-fold-search t)
 	 (start (re-search-forward (shimbun-content-start shimbun) nil t))
 	 (end (and start
@@ -116,6 +121,7 @@
   (shimbun-remove-tags "<img[^>]*doubleclick.net[^>]*>")
   (shimbun-remove-tags "<img[^>]*\\(width\\|height\\)=\"1px\"[^>]*>")
   (shimbun-remove-tags "<tr><td[^>]*>Anzeige</td></tr>")
+  (shimbun-remove-tags "<span class=\"anzeige\">.+?</span>")
   t)
 
 (provide 'sb-zeit-de)