Merge branch 'dev'1.8.0

1 files changed, 49 insertions, 36 deletions

diff --git a/inc/3rdparty/site_config/standard/nytimes.com.txt b/inc/3rdparty/site_config/standard/nytimes.com.txt
index 8d9a794a..23c9ad11 100644..100755
--- a/inc/3rdparty/site_config/standard/nytimes.com.txt
+++ b/inc/3rdparty/site_config/standard/nytimes.com.txt
@@ -1,36 +1,49 @@
-title://h1[@class="articleHeadline"]

-body://div[@id="article"]

-strip_id_or_class:articleTools

-strip_id_or_class:readerscomment

-#strip://div[contains(@class, "articleInline runaroundLeft")]

-strip: //div[contains(@class, "doubleRule")]

-# strip image credit - appears as a bold heading

-strip: //div[contains(@class, "articleInline")]//h6

-strip_id_or_class:enlargeThis

-strip_id_or_class:pageLinks

-strip_id_or_class:memberTools

-strip_id_or_class:articleExtras

-strip_id_or_class:singleAd

-strip_id_or_class:byline

-strip_id_or_class:dateline

-strip_id_or_class:articleheadline

-strip_id_or_class:articleBottomExtra

-strip://a[contains(@href, 'nytimes.com/adx/')]

-strip: //nyt_byline

-strip: //span[contains(@class, 'slideshow') or contains(@class, 'video')]

-strip: //p[@class='caption']//a[contains(., 'More Photos')]

-

-prune: no

-tidy: no

-

-date: substring-after(//*[contains(@class, 'dateline')], 'Published:')

-

-single_page_link: //link[contains(@href, 'pagewanted=all')]

-#single_page_link: //a[contains(@href, 'pagewanted=all') and not(contains(@href, 'login'))]

-

-strip://ul[@id = 'toolsList']

-strip://h6[@class = 'kicker']

-author:substring-after(//h6[@class='byline'],'By ')

-

-test_url: http://www.nytimes.com/2011/07/24/books/review/an-academic-authors-unintentional-masterpiece.html

-test_url: http://www.nytimes.com/2012/06/10/arts/television/the-newsroom-aaron-sorkins-return-to-tv.html
\ No newline at end of file
+title://h1[@class="articleHeadline"]
+body://div[@id="article"]
+body://*[@itemprop="articleBody"]
+strip_id_or_class:articleTools
+strip_id_or_class:readerscomment
+#strip://div[contains(@class, "articleInline runaroundLeft")]
+strip: //div[contains(@class, "doubleRule")]
+# strip image credit - appears as a bold heading
+strip: //div[contains(@class, "articleInline")]//h6
+strip_id_or_class:enlargeThis
+strip_id_or_class:pageLinks
+strip_id_or_class:memberTools
+strip_id_or_class:articleExtras
+strip_id_or_class:singleAd
+strip_id_or_class:byline
+strip_id_or_class:dateline
+strip_id_or_class:articleheadline
+strip_id_or_class:articleBottomExtra
+strip_id_or_class:shareTools
+strip://a[contains(@href, 'nytimes.com/adx/')]
+strip: //nyt_byline
+strip: //span[contains(@class, 'slideshow') or contains(@class, 'video')]
+strip: //p[@class='caption']//a[contains(., 'More Photos')]
+
+prune: no
+tidy: no
+
+find_string: <script 
+replace_string: <div style="display:none" 
+find_string: </script>
+replace_string: </div>
+
+date: substring-after(//*[contains(@class, 'dateline')], 'Published:')
+
+single_page_link: //link[contains(@href, 'pagewanted=all')]
+single_page_link: //link[@rel='alternate' and contains(@href, 'mobile.nytimes.com')]/@href
+single_page_link: concat(substring-before(//div[@id='pageLinks']//a[contains(@href, 'pagewanted=')]/@href, 'pagewanted='), 'pagewanted=all') 
+#single_page_link: //a[contains(@href, 'pagewanted=all') and not(contains(@href, 'login'))]
+
+strip://ul[@id = 'toolsList']
+strip://h6[@class = 'kicker']
+author:substring-after(//h6[@class='byline'],'By ')
+
+test_url: http://www.nytimes.com/2011/07/24/books/review/an-academic-authors-unintentional-masterpiece.html
+test_url: http://www.nytimes.com/2012/06/10/arts/television/the-newsroom-aaron-sorkins-return-to-tv.html
+test_url: http://www.nytimes.com/2013/03/25/world/middleeast/israeli-military-responds-after-patrols-come-under-fire-from-syria.html
+test_url: http://www.nytimes.com/2013/08/15/nyregion/when-the-new-york-city-subway-ran-without-rails.html
+test_url: http://www.nytimes.com/2004/02/29/weekinreview/correspondence-class-consciousness-china-s-wealthy-live-creed-hobbes-darwin-meet.html
+test_url: http://www.nytimes.com/2014/06/19/opinion/gail-collins-romney-and-the-2016-contenders-huddle.html
\ No newline at end of file