From 2727f351d3e17dbe50ef282296e8c2a3bbdb007e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 7 Jun 2010 11:38:07 -0600
Subject: [PATCH] Fix #5742 (Updated recipe for Our Daily Bread)

---
 resources/images/news/ourdailybread.png | Bin 0 -> 739 bytes
 resources/recipes/ourdailybread.recipe  |  40 +++++++++++-------------
 2 files changed, 18 insertions(+), 22 deletions(-)
 create mode 100644 resources/images/news/ourdailybread.png

diff --git a/resources/images/news/ourdailybread.png b/resources/images/news/ourdailybread.png
new file mode 100644
index 0000000000000000000000000000000000000000..771f252216729c70c411f38c1387bbc01141f394
GIT binary patch
literal 739
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87?^lGT^vI!PUlWO?I#i_(6-;|^7(`v#*!DG
zf7oQ~5@4<-5pscd;tQ|X7jE(g=5iYtN~IoL(YS(JOsbMYn2E=r$E${I_rIcx;_XK!
zmuRhg_uslc_SU-lwPGehCxsLR74OJa3f?Wgb-I7XyxKFjUN4W?Q6+y~wz6;c<cUI&
zSqYkg(+Vs#6;yO2)tDJJTTPMdQBXDZaLY2;(3bekKjBM#%sdT_G`EBlK}U@Mi$;Z}
zj)nyt|1B9=j_&qREC>ivoW!B!u|O#3pjP4(@suKUpBX{A6ZX_}E&ImY!SJ_u+D_}V
zw#dx+4ssq&Tu#RsyA%Q@>dQQtv2@ptLv^ZpF$^AY))TsfM73lWRQZGkE6*udxT?i2
zV5`2y37hg`?(8#m)=cAw`1zqV@4fkAW%V6pPi2<!O)a&rtl;+4*&mf${+`|Q-JO}c
zPwe)ez32a)lZVb~#+-Zf$7J>E`x)!&br~%gwBPdH+h$%-kUwq0i95x!l$mqheqqSy
z<y~ZNx%Q*uwr#t=N<3|y`ri7ti=Ll<k7DPU&rLC|4Bz*NJl*=0tKoG-vT=F({_-O(
z#RAOV`06L^eo<0ycu`7?<@WB_C3D{T^#`jTSJ-og)7pNk#M);D#m18zK0G?>&d1l6
zVb(rl{!A4CZ~f~p-+a$7ZQoJ*Sg569-<DH;&jqZFcM7Ck^%rsp`MscM&fn^VRnAM3
zX8vQkaeGbS4gVr1U?Nd1ag8WRNi0dVN-jzTQVd20h6cI@X1WIEA%=!l#%5L~#z3x>
ufkDSgtz9S@a`RI%(<)Ikm{=K^S{Z@#12tGa4LbwWz~JfX=d#Wzp$Pz!K_YDc

literal 0
HcmV?d00001

diff --git a/resources/recipes/ourdailybread.recipe b/resources/recipes/ourdailybread.recipe
index 0b37880377..e0d38db821 100644
--- a/resources/recipes/ourdailybread.recipe
+++ b/resources/recipes/ourdailybread.recipe
@@ -1,9 +1,7 @@
-#!/usr/bin/env  python
-
 __license__   = 'GPL v3'
-__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
 '''
-rbc.org
+odb.org
 '''
 
 from calibre.web.feeds.news import BasicNewsRecipe
@@ -11,27 +9,29 @@ from calibre.web.feeds.news import BasicNewsRecipe
 class OurDailyBread(BasicNewsRecipe):
     title                 = 'Our Daily Bread'
     __author__            = 'Darko Miletic and Sujata Raman'
-    description           = 'Religion'
+    description           = "Our Daily Bread is a daily devotional from RBC Ministries which helps readers spend time each day in God's Word."
     oldest_article        = 15
-    language = 'en'
-    lang = 'en'
-
+    language              = 'en'
     max_articles_per_feed = 100
     no_stylesheets        = True
     use_embedded_content  = False
-    category              = 'religion'
+    category              = 'ODB, Daily Devotional, Bible, Christian Devotional, Devotional, RBC Ministries, Our Daily Bread, Devotionals, Daily Devotionals, Christian Devotionals, Faith, Bible Study, Bible Studies, Scripture, RBC, religion'
     encoding              = 'utf-8'
-  
+
     conversion_options = {
-                             'comments'    : description
-                            ,'tags'        : category
-                            ,'language'    : 'en'
+                             'comments'         : description
+                            ,'tags'             : category
+                            ,'language'         : language
+                            ,'linearize_tables' : True
                          }
 
-    keep_only_tags = [dict(name='div', attrs={'class':['altbg','text']})]
+    keep_only_tags    = [dict(attrs={'class':'module-content'})]
+    remove_tags       = [
+                           dict(attrs={'id':'article-zoom'})
+                          ,dict(attrs={'class':'listen-now-box'})
+                        ]
+    remove_tags_after = dict(attrs={'class':'readable-area'})
 
-    remove_tags = [dict(name='div', attrs={'id':['ctl00_cphPrimary_pnlBookCover']}),
-                   ]
     extra_css = '''
                 .text{font-family:Arial,Helvetica,sans-serif;font-size:x-small;}
                 .devotionalTitle{font-family:Arial,Helvetica,sans-serif; font-size:large; font-weight: bold;}
@@ -40,14 +40,9 @@ class OurDailyBread(BasicNewsRecipe):
                 a{color:#000000;font-family:Arial,Helvetica,sans-serif; font-size:x-small;}
                 '''
 
-    feeds          = [(u'Our Daily Bread', u'http://www.rbc.org/rss.ashx?id=50398')]
+    feeds          = [(u'Our Daily Bread', u'http://odb.org/feed/')]
 
     def preprocess_html(self, soup):
-        soup.html['xml:lang'] = self.lang
-        soup.html['lang']     = self.lang
-        mtag = '<meta http-equiv="Content-Type" content="text/html; charset=' + self.encoding + '">'
-        soup.head.insert(0,mtag)
-
         return self.adeify_images(soup)
 
     def get_cover_url(self):
@@ -61,3 +56,4 @@ class OurDailyBread(BasicNewsRecipe):
            cover_url = a.img['src']
 
         return cover_url
+