Patches for sb-debugmagazin-de.el and sb-perlentaucher-de.el

[David <de_bb@xxxxxxxx>]

Attached are two small patches for sb-debugmagazin-de and
sb-perlentaucher-de, which contain changed URLs and Regexps for the RSS
feeds.

Regards,
David

diff --git a/sb-debugmagazin-de.el b/sb-debugmagazin-de.el
index b0f995a..878febe 100644
--- a/sb-debugmagazin-de.el
+++ b/sb-debugmagazin-de.el
@@ -28,28 +28,38 @@
 (luna-define-class shimbun-debugmagazin-de (shimbun-rss) ())
 
 (defvar shimbun-debugmagazin-de-group-url-regexp
-  '(("news" "http://www.de-bug.de/news/news.xml"
-     "news/\\(.*\\)\\.html")
+  '(("frontpage" "http://feeds.feedburner.com/DebugAllInOne"
+     ".*/\\(.*\\)\\.html")
+    ("musik" "http://www.de-bug.de/musik/news.xml"
+     "musik/\\(.*\\)\\.html")
     ("reviews" "http://www.de-bug.de/reviews/reviews.xml"
      "reviews/\\(.*\\)\\.html")
-    ("texte" "http://www.de-bug.de/texte/texte.xml"
-     "texte/\\(.*\\)\\.html")
-    ("blog" "http://www.de-bug.de/blog/feed"
-     "blog/archives/\\(.*\\)\\.html")
-    ("podcast" "http://www.de-bug.de/pod/wp-rss2.php"
-     "pod/archives/\\(.*\\)\\.html")
+    ("magazin" "http://www.de-bug.de/mag/texte.xml"
+     "mag/\\(.*\\)\\.html")
+    ("medien" "http://feeds.feedburner.com/DebugMedien"
+     ".*/\\(.*\\)\\.html")
+    ("podcast" "http://feeds.feedburner.com/DebugPod"
+     ".*/\\(.*\\)\\.html")
     ("musiktechnik" "http://feeds.feedburner.com/de-bug/SSgQ"
-     "de-bug/.*/.*/\\(.*\\)\\.html")
-    ("mode" "http://www.de-bug.de/fee/feed/"
-     "fee/archives/\\(.*\\)\\.html")))
+     ".*/\\(.*\\)\\.html")
+    ("screen" "http://feeds.feedburner.com/DebugScreen"
+     ".*/\\(.*\\)\\.html")
+    ("gadgets" "http://feeds.feedburner.com/DebugGadgets"
+     ".*/\\(.*\\)\\.html")
+    ("games" "http://feeds.feedburner.com/DebugGames"
+     ".*/\\(.*\\)\\.html")
+    ("mode" "http://feeds.feedburner.com/DebugMode"
+     ".*/\\(.*\\)\\.html")))
 
 (defvar shimbun-debugmagazin-de-groups
   (mapcar 'car shimbun-debugmagazin-de-group-url-regexp))
 (defvar shimbun-debugmagazin-de-from-address "invalid@xxxxxxxxxxxxxxx")
+
 (defvar shimbun-debugmagazin-de-content-start
-  "<div id=\"content\" class=\"narrowcolumn\">")
+  "<div class=\"post\"\\( id=\"post-[0-9]+\"\\)?>")
+
 (defvar shimbun-debugmagazin-de-content-end
-  "\\(?:You can start editing here\\|<h3 id=\"comments\">\\)")
+  "\\(?:You can start editing here\\|<h3 id=\"comments\">\\|DIE MASSE MEINT\\)")
 
 (defvar shimbun-debugmagazin-de-x-face-alist
   '(("default" . "\
diff --git a/sb-perlentaucher-de.el b/sb-perlentaucher-de.el
index d2ca393..385a969 100644
--- a/sb-perlentaucher-de.el
+++ b/sb-perlentaucher-de.el
@@ -32,6 +32,7 @@
 (defvar shimbun-perlentaucher-de-from-address "invalid@xxxxxxxxxxxxxxxx")
 (defvar shimbun-perlentaucher-de-content-start "<div class=\"col_middle\">")
 (defvar shimbun-perlentaucher-de-content-end "<div class=\"col_right\">")
+(defvar shimbun-perlentaucher-de-url-regexp "rss.feedsportal.com/.*/\\([0-9a-f]+\\)/story.*\\.htm")
 
 (defvar shimbun-perlentaucher-de-x-face-alist
   '(("default" . "\
@@ -61,10 +62,8 @@ Face: iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPAgMAAABGuH3ZAAAADFBMVEUAern/+/D///8aGhp
 (luna-define-method shimbun-rss-build-message-id ((shimbun
 						   shimbun-perlentaucher-de)
 						  url date)
-  ;;(message url)
-  (unless (string-match "rssteaser/\\(.*\\)\\.html" url)
+  (unless (string-match shimbun-perlentaucher-de-url-regexp url)
     (error "Cannot find message-id base"))
-  ;;(message (concat "<" (match-string 1 url) "@perlentaucher.de>"))
   (concat "<" (match-string 1 url)
 	  "." (shimbun-current-group-internal shimbun) "@perlentaucher.de>"))