From 64ed0890c6fbf0024f7493f3094f5b8c658cac51 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 4 Feb 2011 10:32:33 -0700 Subject: [PATCH] Fix #6145 (WSJ Recipe puts "Subscriber Content Read Preview" under the ToC with subscribed WSJ account) --- resources/recipes/wsj.recipe | 7 +++++-- resources/recipes/wsj_free.recipe | 5 +++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/recipes/wsj.recipe b/resources/recipes/wsj.recipe index eb473f1121..6095ca71c7 100644 --- a/resources/recipes/wsj.recipe +++ b/resources/recipes/wsj.recipe @@ -131,6 +131,7 @@ class WallStreetJournal(BasicNewsRecipe): 'description':desc, 'date':''}) self.log('\tFound WN article:', title) + self.log('\t\t', desc) return articles @@ -160,14 +161,16 @@ class WallStreetJournal(BasicNewsRecipe): title = self.tag_to_string(a).strip() + ' [%s]'%self.tag_to_string(meta) url = 'http://online.wsj.com'+a['href'] desc = '' - p = container.find('p') - if p is not None: + for p in container.findAll('p'): desc = self.tag_to_string(p) + if not 'Subscriber Content' in desc: + break articles.append({'title':title, 'url':url, 'description':desc, 'date':''}) self.log('\tFound article:', title) + self.log('\t\t', desc) return articles diff --git a/resources/recipes/wsj_free.recipe b/resources/recipes/wsj_free.recipe index a4a957fc90..bc16a8de3b 100644 --- a/resources/recipes/wsj_free.recipe +++ b/resources/recipes/wsj_free.recipe @@ -143,9 +143,10 @@ class WallStreetJournal(BasicNewsRecipe): title = self.tag_to_string(a).strip() + ' [%s]'%self.tag_to_string(meta) url = 'http://online.wsj.com'+a['href'] desc = '' - p = container.find('p') - if p is not None: + for p in container.findAll('p'): desc = self.tag_to_string(p) + if not 'Subscriber Content' in desc: + break articles.append({'title':title, 'url':url, 'description':desc, 'date':''})