Skip to content

fix ignore region extraction when it is inside an annotation which uses text content extraction, and added test #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 26, 2012
Merged

fix ignore region extraction when it is inside an annotation which uses text content extraction, and added test #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions scrapely/extraction/pageobjects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from itertools import chain
from numpy import array, ndarray

from scrapely.htmlpage import HtmlTagType, HtmlPageRegion
from scrapely.htmlpage import HtmlTagType, HtmlPageRegion, HtmlPageParsedRegion

class TokenType(HtmlTagType):
"""constants for token types"""
Expand Down Expand Up @@ -82,7 +82,7 @@ def __str__(self):
def __repr__(self):
return str(self)

class FragmentedHtmlPageRegion(HtmlPageRegion):
class FragmentedHtmlPageRegion(HtmlPageParsedRegion, HtmlPageRegion):
"""An HtmlPageRegion consisting of possibly non-contiguous sub-regions"""
def __new__(cls, htmlpage, regions):
text = u''.join(regions)
Expand All @@ -95,11 +95,7 @@ def __init__(self, htmlpage, regions):
@property
def parsed_fragments(self):
return chain(*(r.parsed_fragments for r in self.regions))

@property
def text_content(self):
return chain(*(r.text_content for r in self.regions))


class Page(object):
"""Basic representation of a page. This consists of a reference to a
dictionary of tokens and an array of raw token ids
Expand Down
12 changes: 12 additions & 0 deletions scrapely/tests/test_extraction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,10 @@
'item test',
[A('phone', 'phone number', lambda x: contains_any_numbers(x.text_content))])

SAMPLE_DESCRIPTOR4 = ItemDescriptor('test',
'item test, removes tags from description attribute',
[A('description', 'description field without tags', lambda x: x.text_content)])

# A list of (test name, [templates], page, extractors, expected_result)
TEST_DATA = [
# extract from a similar page
Expand Down Expand Up @@ -1052,6 +1056,14 @@
'price': [u'\n12.00\n(VAT exc.)'],
}
),
# ignored regions and text content extraction
(
'ignored_regions', [ANNOTATED_PAGE8], EXTRACT_PAGE8, SAMPLE_DESCRIPTOR4,
{
'description': [u'\n A very nice product for all intelligent people \n \n'],
'price': [u'\n12.00\n(VAT exc.)'],
}
),
# shifted ignored regions (detected by region similarity)
(
'shifted_ignored_regions', [ANNOTATED_PAGE9], EXTRACT_PAGE9, DEFAULT_DESCRIPTOR,
Expand Down