From e2c048e23aaf94e08ae3b1debacfbc61d8539c61 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 25 Jul 2010 19:57:19 -0600 Subject: [PATCH] Fix #6292 (Updated recipes) --- resources/recipes/rian_spa.recipe | 12 ++++-------- resources/recipes/vijesti.recipe | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/resources/recipes/rian_spa.recipe b/resources/recipes/rian_spa.recipe index 5d2115168b..2f6ecbcd98 100644 --- a/resources/recipes/rian_spa.recipe +++ b/resources/recipes/rian_spa.recipe @@ -1,13 +1,13 @@ __license__ = 'GPL v3' -__copyright__ = '2009, Darko Miletic ' +__copyright__ = '2009-2010, Darko Miletic ' ''' sp.rian.ru ''' from calibre.web.feeds.news import BasicNewsRecipe -class Ria_eng(BasicNewsRecipe): +class Ria_esp(BasicNewsRecipe): title = 'Ria Novosti' __author__ = 'Darko Miletic' description = 'Noticias desde Russia en Castellano' @@ -28,14 +28,10 @@ class Ria_eng(BasicNewsRecipe): } - keep_only_tags = [dict(name='div', attrs={'class':'articletxt'})] + keep_only_tags = [dict(name='div', attrs={'class':['mainnewsrubric','titleblock','mainnewstxt']})] remove_tags = [dict(name=['object','link','iframe','base'])] - remove_tags_after = dict(name='div',attrs={'class':'text'}) - feeds = [(u'Noticias', u'http://sp.rian.ru/export/rss2/index.xml')] - - def print_version(self, url): - return url.replace('.html','-print.html') + feeds = [(u'Noticias', u'http://rss.feedsportal.com/c/860/fe.ed/sp.rian.ru/export/rss2/index.xml')] diff --git a/resources/recipes/vijesti.recipe b/resources/recipes/vijesti.recipe index 969b300486..c901755b78 100644 --- a/resources/recipes/vijesti.recipe +++ b/resources/recipes/vijesti.recipe @@ -36,7 +36,7 @@ class Vijesti(BasicNewsRecipe): keep_only_tags = [dict(name='div', attrs={'id':'mainnews'})] - remove_tags = [dict(name=['object','link','embed'])] + remove_tags = [dict(name=['object','link','embed','form'])] feeds = [(u'Sve vijesti', u'http://www.vijesti.me/rss.php' )]